From 16a70febc0c373a6a7a271459e0d100015900bc6 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 11 May 2012 10:59:09 +1000 Subject: [PATCH] --- yaml --- r: 309815 b: refs/heads/master c: dea649b8ac1861107c5d91e1a71121434fc64193 h: refs/heads/master i: 309813: ef5c8144119a8264fc4455b85b36cba5c844a4af 309811: 84c04092459f18318643ce8bf12aa5ac7de0a748 309807: 5c959db1ac401f50129c090905e71d58de288f7b v: v3 --- [refs] | 2 +- trunk/include/linux/key.h | 2 -- trunk/include/linux/tracehook.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d1bb8464783d..9dcfdf0e80df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 413cd3d9abeaef590e5ce00564f7a443165db238 +refs/heads/master: dea649b8ac1861107c5d91e1a71121434fc64193 diff --git a/trunk/include/linux/key.h b/trunk/include/linux/key.h index 2a0ee11584e9..4cd22ed627ef 100644 --- a/trunk/include/linux/key.h +++ b/trunk/include/linux/key.h @@ -33,8 +33,6 @@ typedef uint32_t key_perm_t; struct key; -#define key_replace_session_keyring() do { } while (0) - #ifdef CONFIG_KEYS #undef KEY_DEBUGGING diff --git a/trunk/include/linux/tracehook.h b/trunk/include/linux/tracehook.h index b2dd0917ca0d..6a4d82bedb03 100644 --- a/trunk/include/linux/tracehook.h +++ b/trunk/include/linux/tracehook.h @@ -186,8 +186,6 @@ static inline void set_notify_resume(struct task_struct *task) */ static inline void tracehook_notify_resume(struct pt_regs *regs) { - if (current->replacement_session_keyring) - key_replace_session_keyring(); /* * The caller just cleared TIF_NOTIFY_RESUME. This barrier * pairs with task_work_add()->set_notify_resume() after