Merge tag 'sched_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

682b26bd · Linus Torvalds <[email protected]> · 2021-04-25 09:08:19 -07:00

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

Commit: 682b26bd80f96c2e4da3eb6dcec8bf684b79151c
Parents: 11fac7a0 · 0c89d87d

Merge commit. Changes below are compared with the first parent: 11fac7a0.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/entry/common.c	modified	+1	−1	View file

kernel/entry/common.c

View file

diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 8442e5c..2003d69 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();