recent kernels have finally stopped exporting kernel_thread, since a
deprecation circa 2006. This patch attempts to convert to the newer
kernel kthread API, particularly in random.c
[juhosg: remove randomproc variable, it is not required after the patch]
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35456
#include <linux/unistd.h>
#include <linux/poll.h>
#include <linux/random.h>
#include <linux/unistd.h>
#include <linux/poll.h>
#include <linux/random.h>
+#include <linux/kthread.h>
#include <cryptodev.h>
#ifdef CONFIG_OCF_FIPS
#include <cryptodev.h>
#ifdef CONFIG_OCF_FIPS
+static struct task_struct *random_thread;
static int random_proc(void *arg);
static int random_proc(void *arg);
-static pid_t randomproc = (pid_t) -1;
static spinlock_t random_lock;
/*
static spinlock_t random_lock;
/*
spin_lock_irqsave(&random_lock, flags);
list_add_tail(&rops->random_list, &random_ops);
if (!started) {
spin_lock_irqsave(&random_lock, flags);
list_add_tail(&rops->random_list, &random_ops);
if (!started) {
- randomproc = kernel_thread(random_proc, NULL, CLONE_FS|CLONE_FILES);
- if (randomproc < 0) {
- ret = randomproc;
- printk("crypto: crypto_rregister cannot start random thread; "
- "error %d", ret);
- } else
+ random_thread = kthread_run(random_proc, NULL, "ocf-random");
+ if (IS_ERR(random_thread))
+ ret = PTR_ERR(random_thread);
+ else
started = 1;
}
spin_unlock_irqrestore(&random_lock, flags);
started = 1;
}
spin_unlock_irqrestore(&random_lock, flags);
spin_lock_irqsave(&random_lock, flags);
if (list_empty(&random_ops) && started)
spin_lock_irqsave(&random_lock, flags);
if (list_empty(&random_ops) && started)
- kill_proc(randomproc, SIGKILL, 1);
+ kthread_stop(random_thread);
spin_unlock_irqrestore(&random_lock, flags);
return(0);
}
spin_unlock_irqrestore(&random_lock, flags);
return(0);
}
sprintf(current->comm, "ocf-random");
#else
daemonize("ocf-random");
sprintf(current->comm, "ocf-random");
#else
daemonize("ocf-random");
kfree(buf);
bad_alloc:
spin_lock_irq(&random_lock);
kfree(buf);
bad_alloc:
spin_lock_irq(&random_lock);
- randomproc = (pid_t) -1;
started = 0;
spin_unlock_irq(&random_lock);
started = 0;
spin_unlock_irq(&random_lock);