summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-25 09:08:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-25 09:08:19 -0700
commit682b26bd80f96c2e4da3eb6dcec8bf684b79151c (patch)
tree775dd20e820dd8fac44c1672ffafb423f7c1b5cf
parent11fac7a004113466b7155e9b0d836156cf8a7e8d (diff)
parent0c89d87d1d43d9fa268d1dc489518564d58bf497 (diff)
downloadlinux-682b26bd80f96c2e4da3eb6dcec8bf684b79151c.tar.bz2
Merge tag 'sched_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov: "Fix a typo in a macro ifdeffery" * tag 'sched_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: preempt/dynamic: Fix typo in macro conditional statement
-rw-r--r--kernel/entry/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 8442e5c9cfa2..2003d69bd6d5 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -422,7 +422,7 @@ noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
instrumentation_begin();
if (IS_ENABLED(CONFIG_PREEMPTION)) {
-#ifdef CONFIG_PREEMT_DYNAMIC
+#ifdef CONFIG_PREEMPT_DYNAMIC
static_call(irqentry_exit_cond_resched)();
#else
irqentry_exit_cond_resched();