diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 15:23:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 15:23:19 -0700 |
| commit | e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4 (patch) | |
| tree | 6a41361e1de2a6693ccae96b99307e79a467236f /arch/arc | |
| parent | 34273f41d57ee8d854dcd2a1d754cbb546cb548f (diff) | |
| parent | 7ed6fb9b5a5510e4ef78ab27419184741169978a (diff) | |
| download | linux-e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4.tar.bz2 | |
Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix
Merge in Linus' tree with:
fa81511bb0bb x86-64, modify_ldt: Make support for 16-bit segments a runtime option
... reverted, to avoid a conflict. This commit is no longer necessary
with the proper fix in place.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/kernel/entry.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S index 819dd5f7eb05..29b82adbf0b4 100644 --- a/arch/arc/kernel/entry.S +++ b/arch/arc/kernel/entry.S @@ -614,11 +614,13 @@ resume_user_mode_begin: resume_kernel_mode: -#ifdef CONFIG_PREEMPT - - ; This is a must for preempt_schedule_irq() + ; Disable Interrupts from this point on + ; CONFIG_PREEMPT: This is a must for preempt_schedule_irq() + ; !CONFIG_PREEMPT: To ensure restore_regs is intr safe IRQ_DISABLE r9 +#ifdef CONFIG_PREEMPT + ; Can't preempt if preemption disabled GET_CURR_THR_INFO_FROM_SP r10 ld r8, [r10, THREAD_INFO_PREEMPT_COUNT] |