Commit 0d2cc3b3 authored Apr 02, 2019 by Frederic Weisbecker Committed by Ingo Molnar Apr 18, 2019

locking/lockdep: Move valid_state() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING



valid_state() and print_usage_bug*() functions are not used beyond
irq locking correctness checks under CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING.

Sadly the "unused function" warning wouldn't fire because valid_state()
is inline so the unused case has remained unseen until now.

So move them inside the appropriate CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING
section.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Link: https://lkml.kernel.org/r/20190402160244.32434-2-frederic@kernel.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 26536e7c

kernel/locking/lockdep.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -2784,6 +2784,12 @@ static void check_chain_key(struct task_struct *curr)
		#endif
		}

		static int mark_lock(struct task_struct curr, struct held_lock this,
		enum lock_usage_bit new_bit);

		#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)


		static void
		print_usage_bug_scenario(struct held_lock *lock)
		{
		@@ -2853,10 +2859,6 @@ valid_state(struct task_struct curr, struct held_lock this,
		return 1;
		}

		static int mark_lock(struct task_struct curr, struct held_lock this,
		enum lock_usage_bit new_bit);

		#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)

		/*
		* print irq inversion bug:

Admin message