diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-27 11:07:19 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-22 23:57:56 +0400 |
| commit | 67d1214551e800f9fe7dc7c47a346d2df0fafed5 (patch) | |
| tree | ffcc93af9390339adda36668255e617073b724a1 /kernel/irq | |
| parent | 158e1645e07f3e9f7e4962d7a0997f5c3b98311b (diff) | |
| download | blackbird-op-linux-67d1214551e800f9fe7dc7c47a346d2df0fafed5.tar.gz blackbird-op-linux-67d1214551e800f9fe7dc7c47a346d2df0fafed5.zip | |
merge task_work and rcu_head, get rid of separate allocation for keyring case
task_work and rcu_head are identical now; merge them (calling the result
struct callback_head, rcu_head #define'd to it), kill separate allocation
in security/keys since we can just use cred->rcu now.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index d1dd54734ce7..814c9ef6bba1 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -781,7 +781,7 @@ static void wake_threads_waitq(struct irq_desc *desc) wake_up(&desc->wait_for_threads); } -static void irq_thread_dtor(struct task_work *unused) +static void irq_thread_dtor(struct callback_head *unused) { struct task_struct *tsk = current; struct irq_desc *desc; @@ -813,7 +813,7 @@ static void irq_thread_dtor(struct task_work *unused) */ static int irq_thread(void *data) { - struct task_work on_exit_work; + struct callback_head on_exit_work; static const struct sched_param param = { .sched_priority = MAX_USER_RT_PRIO/2, }; |
