summaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/process.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:56:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:56:35 -0700
commita57d985e378ca69f430b85852e4187db3698a89e (patch)
tree01fbc23313959d20fcd4e7385ef5a056b47c1828 /arch/ia64/kernel/process.c
parentcdeb9b014331af4282be522824e36f3aa33f0671 (diff)
parent39c9a4ab2b91bff26801c86e423ef07fb705b3c0 (diff)
Merge tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck: "Usual mish-mash of ia64 fixes for next merge window" * tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] xen: Fix return value check in xencomm_vtop() [IA64] Must enable interrupts in do_notify_resume_user before calling tracehook_notify_resume() [IA64] kexec: Move the dereference below the NULL test [IA64] Fix a node distance bug
Diffstat (limited to 'arch/ia64/kernel/process.c')
-rw-r--r--arch/ia64/kernel/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 3e316ec0b835..ee31fe9b310e 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -197,8 +197,8 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
ia64_do_signal(scr, in_syscall);
}
- if (test_thread_flag(TIF_NOTIFY_RESUME)) {
- clear_thread_flag(TIF_NOTIFY_RESUME);
+ if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+ local_irq_enable(); /* force interrupt enable */
tracehook_notify_resume(&scr->pt);
}