diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:03 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:58 +0100 |
commit | 2e3d4de1bd80b2f205aab0ed0a25daef464ab91c (patch) | |
tree | 7caa6a353f9ff9f5e196ed01bbbfce1c8c5ec8ae /arch/x86/kernel/ptrace.c | |
parent | ALSA: i2sbus: Deletion of unnecessary checks before the function call "release_and_free_resource" (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | linux-dev-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.tar.xz linux-dev-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.zip |
Merge tag 'v3.18-rc7' into for-next
... for allowing more cleanups of hda_intel.c driver-caps where both
upstream and for-next contain the changes.
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
-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) */ if (work & _TIF_NOHZ) { user_exit(); - work &= ~TIF_NOHZ; + work &= ~_TIF_NOHZ; } #ifdef CONFIG_SECCOMP |