diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-10-15 21:17:48 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:32 +0100 |
| commit | e7289c6de81c8e8991148e46c9ab43e2d23940f3 (patch) | |
| tree | a9368c6fa360c1ebc06b5431fa66581c86446803 /arch/arm/include/asm/switch_to.h | |
| parent | Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches (diff) | |
| download | linux-dev-e7289c6de81c8e8991148e46c9ab43e2d23940f3.tar.xz linux-dev-e7289c6de81c8e8991148e46c9ab43e2d23940f3.zip | |
sched/rt, ARM: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT.
Both PREEMPT and PREEMPT_RT require the same functionality which today
depends on CONFIG_PREEMPT.
Switch the entry code, cache over to use CONFIG_PREEMPTION and add output
in show_stack() for PREEMPT_RT.
[bigeasy: +traps.c]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20191015191821.11479-2-bigeasy@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/switch_to.h')
| -rw-r--r-- | arch/arm/include/asm/switch_to.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h index d3e937dcee4d..007d8fea7157 100644 --- a/arch/arm/include/asm/switch_to.h +++ b/arch/arm/include/asm/switch_to.h @@ -10,7 +10,7 @@ * to ensure that the maintenance completes in case we migrate to another * CPU. */ -#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP) && defined(CONFIG_CPU_V7) +#if defined(CONFIG_PREEMPTION) && defined(CONFIG_SMP) && defined(CONFIG_CPU_V7) #define __complete_pending_tlbi() dsb(ish) #else #define __complete_pending_tlbi() |