diff options
author | Srikar Dronamraju <srikar@linux.vnet.ibm.com> | 2011-10-25 10:18:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 02:20:34 -0500 |
commit | 3596ff4e6b2aff8a28c69af389d5046090a53330 (patch) | |
tree | 511c55ce65e51e22b1cb32665724a59ca13a5fe8 /arch/x86 | |
parent | 668b44846606185a9bed5a5357bc2cb132e00dd7 (diff) |
x86: Call do_notify_resume() with interrupts enabled
do_notify_resume() gets called with interrupts disabled on x86_32. This
is different from the x86_64 behavior, where interrupts are enabled at
the time.
Queries on lkml on this issue hasn't yielded any clear answer. Lets make
x86_32 behave the same as x86_64, unless there is a real reason to
maintain status quo.
Please refer https://lkml.org/lkml/2011/9/27/130 for more
details.
A similar change was suggested in ARM:
https://lkml.org/lkml/2011/8/25/231
My 32-bit machine works fine (tm) with this patch.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20111025141812.GA21225@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/entry_32.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index f3f6f5344001..22d0e21b4dd7 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -625,6 +625,8 @@ work_notifysig: # deal with pending signals and | |||
625 | movl %esp, %eax | 625 | movl %esp, %eax |
626 | jne work_notifysig_v86 # returning to kernel-space or | 626 | jne work_notifysig_v86 # returning to kernel-space or |
627 | # vm86-space | 627 | # vm86-space |
628 | TRACE_IRQS_ON | ||
629 | ENABLE_INTERRUPTS(CLBR_NONE) | ||
628 | xorl %edx, %edx | 630 | xorl %edx, %edx |
629 | call do_notify_resume | 631 | call do_notify_resume |
630 | jmp resume_userspace_sig | 632 | jmp resume_userspace_sig |
@@ -638,6 +640,8 @@ work_notifysig_v86: | |||
638 | #else | 640 | #else |
639 | movl %esp, %eax | 641 | movl %esp, %eax |
640 | #endif | 642 | #endif |
643 | TRACE_IRQS_ON | ||
644 | ENABLE_INTERRUPTS(CLBR_NONE) | ||
641 | xorl %edx, %edx | 645 | xorl %edx, %edx |
642 | call do_notify_resume | 646 | call do_notify_resume |
643 | jmp resume_userspace_sig | 647 | jmp resume_userspace_sig |