diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/key.h | 2 | ||||
-rw-r--r-- | include/linux/tracehook.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 2a0ee11584e9..4cd22ed627ef 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
@@ -33,8 +33,6 @@ 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 | |||
38 | #ifdef CONFIG_KEYS | 36 | #ifdef CONFIG_KEYS |
39 | 37 | ||
40 | #undef KEY_DEBUGGING | 38 | #undef KEY_DEBUGGING |
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h index b2dd0917ca0d..6a4d82bedb03 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h | |||
@@ -186,8 +186,6 @@ static inline void set_notify_resume(struct task_struct *task) | |||
186 | */ | 186 | */ |
187 | static inline void tracehook_notify_resume(struct pt_regs *regs) | 187 | static inline void tracehook_notify_resume(struct pt_regs *regs) |
188 | { | 188 | { |
189 | if (current->replacement_session_keyring) | ||
190 | key_replace_session_keyring(); | ||
191 | /* | 189 | /* |
192 | * The caller just cleared TIF_NOTIFY_RESUME. This barrier | 190 | * The caller just cleared TIF_NOTIFY_RESUME. This barrier |
193 | * pairs with task_work_add()->set_notify_resume() after | 191 | * pairs with task_work_add()->set_notify_resume() after |