diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 14:44:37 -0400 | 
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 22:09:20 -0400 | 
| commit | a42c6ded827dbd396d2efde7530620be029a72d1 (patch) | |
| tree | ea3129404f32515a04497990a050b2cf73aa1d5d /arch/um/kernel/process.c | |
| parent | 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (diff) | |
| download | olio-linux-3.10-a42c6ded827dbd396d2efde7530620be029a72d1.tar.xz olio-linux-3.10-a42c6ded827dbd396d2efde7530620be029a72d1.zip  | |
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 3a2235e0abc..ccb9a9d283f 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -117,11 +117,8 @@ void interrupt_end(void)  		schedule();  	if (test_thread_flag(TIF_SIGPENDING))  		do_signal(); -	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) { +	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))  		tracehook_notify_resume(¤t->thread.regs); -		if (current->replacement_session_keyring) -			key_replace_session_keyring(); -	}  }  void exit_thread(void)  |