Message ID | 157581711171.21853.11624347815991134047.tip-bot2@tip-bot2 |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | [tip:,sched/urgent] sched/rt, sparc: Use CONFIG_PREEMPTION | expand |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index eb24cb1..e8c3ea0 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -277,7 +277,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y - depends on SPARC64 && SMP && PREEMPT + depends on SPARC64 && SMP && PREEMPTION config NUMA bool "NUMA support" diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S index 29aa34f..c5fd4b4 100644 --- a/arch/sparc/kernel/rtrap_64.S +++ b/arch/sparc/kernel/rtrap_64.S @@ -310,7 +310,7 @@ kern_rtt_restore: retry to_kernel: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldsw [%g6 + TI_PRE_COUNT], %l5 brnz %l5, kern_fpucheck ldx [%g6 + TI_FLAGS], %l5