]> Git Repo - linux.git/commitdiff
keys: kill the dummy key_replace_session_keyring()
authorOleg Nesterov <[email protected]>
Fri, 11 May 2012 00:59:09 +0000 (10:59 +1000)
committerAl Viro <[email protected]>
Thu, 24 May 2012 02:11:31 +0000 (22:11 -0400)
After the previouse change key_replace_session_keyring() becomes a nop.
Remove the dummy definition in key.h and update the callers in
arch/*/kernel/signal.c.

Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: David Howells <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Richard Kuo <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Alexander Gordeev <[email protected]>
Cc: Chris Zankel <[email protected]>
Cc: David Smith <[email protected]>
Cc: "Frank Ch. Eigler" <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Larry Woodman <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Al Viro <[email protected]>
include/linux/key.h
include/linux/tracehook.h

index 2a0ee11584e9462e9749f8927d24ddce12605a54..4cd22ed627efd79205860b0efa6dde15a07897ed 100644 (file)
@@ -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
index b2dd0917ca0d6d9a1ecaed8a78324f5ddbaaa32a..6a4d82bedb03d4f6e9742069c40324c0441265f0 100644 (file)
@@ -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
This page took 0.060343 seconds and 4 git commands to generate.