Commit 682b26bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 11fac7a0 0c89d87d

kernel/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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();