diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-02 14:12:06 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-20 09:50:17 -0400 |
commit | e76623d69408d0bd66a296c6ee5eae1b17a6adfc (patch) | |
tree | 91011050463a05f2950ccf12a1c2a7287bbae1a5 /arch/x86/kernel/process.c | |
parent | c46de2263f42fb4bbde411b9126f471e9343cb22 (diff) |
x86: get rid of TIF_IRET hackery
TIF_NOTIFY_RESUME will work in precisely the same way; all that
is achieved by TIF_IRET is appearing that there's some work to be
done, so we end up on the iret exit path. Just use NOTIFY_RESUME.
And for execve() do that in 32bit start_thread(), not sys_execve()
itself.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ef6a8456f719..7162e9c1f598 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -351,14 +351,6 @@ long sys_execve(const char __user *name, | |||
351 | if (IS_ERR(filename)) | 351 | if (IS_ERR(filename)) |
352 | return error; | 352 | return error; |
353 | error = do_execve(filename, argv, envp, regs); | 353 | error = do_execve(filename, argv, envp, regs); |
354 | |||
355 | #ifdef CONFIG_X86_32 | ||
356 | if (error == 0) { | ||
357 | /* Make sure we don't return using sysenter.. */ | ||
358 | set_thread_flag(TIF_IRET); | ||
359 | } | ||
360 | #endif | ||
361 | |||
362 | putname(filename); | 354 | putname(filename); |
363 | return error; | 355 | return error; |
364 | } | 356 | } |