Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arc / kernel / entry.S

diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S
index 72be01270e24632d1b53756f03dfacdd19442db5..1f6bb184a44dbedb7686cf82b130c6ff93292775 100644 (file)
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -337,11 +337,11 @@ resume_user_mode_begin:
 resume_kernel_mode:
 
        ; 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
+       ; CONFIG_PREEMPTION: This is a must for preempt_schedule_irq()
+       ; !CONFIG_PREEMPTION: To ensure restore_regs is intr safe
        IRQ_DISABLE     r9
 
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPTION
 
        ; Can't preempt if preemption disabled
        GET_CURR_THR_INFO_FROM_SP   r10