Commit 6a8d0d28 authored Nov 08, 2020 by Linus Torvalds

Merge tag 'core-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull entry code fix from Thomas Gleixner:
 "A single fix for the generic entry code to correct the wrong
  assumption that the lockdep interrupt state needs not to be
  established before calling the RCU check"

* tag 'core-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  entry: Fix the incorrect ordering of lockdep and RCU check

parents e942d752 9d820f68

kernel/entry/common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -337,10 +337,10 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
		* already contains a warning when RCU is not watching, so no point
		* in having another one here.
		*/
		lockdep_hardirqs_off(CALLER_ADDR0);
		instrumentation_begin();
		rcu_irq_enter_check_tick();
		/* Use the combo lockdep/tracing function */
		trace_hardirqs_off();
		trace_hardirqs_off_finish();
		instrumentation_end();

		return ret;

Admin message