diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index ef596c7af585..2417f789d29b 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/sysctl.h> | 22 | #include <linux/sysctl.h> |
| 23 | #include <linux/rwsem.h> | 23 | #include <linux/rwsem.h> |
| 24 | #include <linux/atomic.h> | 24 | #include <linux/atomic.h> |
| 25 | #include <linux/assoc_array.h> | ||
| 25 | 26 | ||
| 26 | #ifdef __KERNEL__ | 27 | #ifdef __KERNEL__ |
| 27 | #include <linux/uidgid.h> | 28 | #include <linux/uidgid.h> |
| @@ -196,11 +197,13 @@ struct key { | |||
| 196 | * whatever | 197 | * whatever |
| 197 | */ | 198 | */ |
| 198 | union { | 199 | union { |
| 199 | unsigned long value; | 200 | union { |
| 200 | void __rcu *rcudata; | 201 | unsigned long value; |
| 201 | void *data; | 202 | void __rcu *rcudata; |
| 202 | struct keyring_list __rcu *subscriptions; | 203 | void *data; |
| 203 | } payload; | 204 | } payload; |
| 205 | struct assoc_array keys; | ||
| 206 | }; | ||
| 204 | }; | 207 | }; |
| 205 | 208 | ||
| 206 | extern struct key *key_alloc(struct key_type *type, | 209 | extern struct key *key_alloc(struct key_type *type, |
