diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 5231800770e1..2a0ee11584e9 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
| @@ -33,6 +33,8 @@ typedef uint32_t key_perm_t; | |||
| 33 | 33 | ||
| 34 | struct key; | 34 | struct key; |
| 35 | 35 | ||
| 36 | #define key_replace_session_keyring() do { } while (0) | ||
| 37 | |||
| 36 | #ifdef CONFIG_KEYS | 38 | #ifdef CONFIG_KEYS |
| 37 | 39 | ||
| 38 | #undef KEY_DEBUGGING | 40 | #undef KEY_DEBUGGING |
| @@ -308,9 +310,6 @@ static inline bool key_is_instantiated(const struct key *key) | |||
| 308 | #ifdef CONFIG_SYSCTL | 310 | #ifdef CONFIG_SYSCTL |
| 309 | extern ctl_table key_sysctls[]; | 311 | extern ctl_table key_sysctls[]; |
| 310 | #endif | 312 | #endif |
| 311 | |||
| 312 | extern void key_replace_session_keyring(void); | ||
| 313 | |||
| 314 | /* | 313 | /* |
| 315 | * the userspace interface | 314 | * the userspace interface |
| 316 | */ | 315 | */ |
| @@ -334,7 +333,6 @@ extern void key_init(void); | |||
| 334 | #define key_fsuid_changed(t) do { } while(0) | 333 | #define key_fsuid_changed(t) do { } while(0) |
| 335 | #define key_fsgid_changed(t) do { } while(0) | 334 | #define key_fsgid_changed(t) do { } while(0) |
| 336 | #define key_init() do { } while(0) | 335 | #define key_init() do { } while(0) |
| 337 | #define key_replace_session_keyring() do { } while(0) | ||
| 338 | 336 | ||
| 339 | #endif /* CONFIG_KEYS */ | 337 | #endif /* CONFIG_KEYS */ |
| 340 | #endif /* __KERNEL__ */ | 338 | #endif /* __KERNEL__ */ |
