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

Linus Torvalds committed 5 years ago

Commit 682b26b2 parents 11fac7a 0c89d871 file · +1 −1Browse files

Unified · Split

kernel/entry/common.c+1−1

@@ -422,7 +422,7 @@ noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state) · 421 unmodified lines
422		422
423	instrumentation_begin();	423	instrumentation_begin();
424	if (IS_ENABLED(CONFIG_PREEMPTION)) {	424	if (IS_ENABLED(CONFIG_PREEMPTION)) {
425	#ifdef CONFIG_PREEMT_DYNAMIC	425	#ifdef CONFIG_PREEMPT_DYNAMIC
426	static_call(irqentry_exit_cond_resched)();	426	static_call(irqentry_exit_cond_resched)();
427	#else	427	#else
428	irqentry_exit_cond_resched();	428	irqentry_exit_cond_resched();