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 /include/linux/types.h | |
parent | 158e1645e07f3e9f7e4962d7a0997f5c3b98311b (diff) | |
download | linux-3.10-67d1214551e800f9fe7dc7c47a346d2df0fafed5.tar.gz linux-3.10-67d1214551e800f9fe7dc7c47a346d2df0fafed5.tar.bz2 linux-3.10-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 'include/linux/types.h')
-rw-r--r-- | include/linux/types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 9c1bd539ea7..bf0dd7524b2 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -246,14 +246,15 @@ struct ustat { }; /** - * struct rcu_head - callback structure for use with RCU + * struct callback_head - callback structure for use with RCU and task_work * @next: next update requests in a list * @func: actual update function to call after the grace period. */ -struct rcu_head { - struct rcu_head *next; - void (*func)(struct rcu_head *head); +struct callback_head { + struct callback_head *next; + void (*func)(struct callback_head *head); }; +#define rcu_head callback_head #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ |