diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-11-19 16:56:19 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-11-20 17:01:53 -0500 |
| commit | b5e212a3051b65e426a513901d9c7001681c7215 (patch) | |
| tree | 61ee6c5bb71364d1436136cfb4c1e318f533594b /arch/x86 | |
| parent | 70b61e362187b5fccac206506d402f3424e3e749 (diff) | |
x86, syscall: Fix _TIF_NOHZ handling in syscall_trace_enter_phase1
TIF_NOHZ is 19 (i.e. _TIF_SYSCALL_TRACE | _TIF_NOTIFY_RESUME |
_TIF_SINGLESTEP), not (1<<19).
This code is involved in Dave's trinity lockup, but I don't see why
it would cause any of the problems he's seeing, except inadvertently
by causing a different path through entry_64.S's syscall handling.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/a6cd3b60a3f53afb6e1c8081b0ec30ff19003dd7.1416434075.git.luto@amacapital.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 749b0e423419..e510618b2e91 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
| @@ -1484,7 +1484,7 @@ unsigned long syscall_trace_enter_phase1(struct pt_regs *regs, u32 arch) | |||
| 1484 | */ | 1484 | */ |
| 1485 | if (work & _TIF_NOHZ) { | 1485 | if (work & _TIF_NOHZ) { |
| 1486 | user_exit(); | 1486 | user_exit(); |
| 1487 | work &= ~TIF_NOHZ; | 1487 | work &= ~_TIF_NOHZ; |
| 1488 | } | 1488 | } |
| 1489 | 1489 | ||
| 1490 | #ifdef CONFIG_SECCOMP | 1490 | #ifdef CONFIG_SECCOMP |