diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /arch/x86/include/asm/thread_info.h | |
parent | ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery (diff) | |
parent | ALSA: atmel_abdac: Add missing clock prepare (diff) | |
download | linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
-rw-r--r-- | arch/x86/include/asm/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 854053889d4d..547e344a6dc6 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -141,7 +141,7 @@ struct thread_info { /* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ (_TIF_SIGPENDING | _TIF_MCE_NOTIFY | _TIF_NOTIFY_RESUME | \ - _TIF_USER_RETURN_NOTIFY) + _TIF_USER_RETURN_NOTIFY | _TIF_UPROBE) /* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ |