Loosely handle all the softirq vectors verbosity under the same function. Reviewed-by: David S. Miller <da...@davemloft.net> Signed-off-by: Frederic Weisbecker <frede...@kernel.org> Cc: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> Cc: Joel Fernandes <j...@joelfernandes.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Pavan Kondeti <pkond...@codeaurora.org> Cc: Paul E . McKenney <paul...@linux.vnet.ibm.com> Cc: David S . Miller <da...@davemloft.net> Cc: Ingo Molnar <mi...@kernel.org> Cc: Sebastian Andrzej Siewior <bige...@linutronix.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> --- kernel/locking/lockdep.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index d1bfe5eff708..0988de06a7ed 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -2757,17 +2757,13 @@ static int SOFTIRQ_verbose(struct lock_class *class) #define STRICT_READ_CHECKS 1 -static int (*state_verbose_f[])(struct lock_class *class) = { -#define LOCKDEP_STATE(__STATE) \ - __STATE##_verbose, -#include "lockdep_states.h" -#undef LOCKDEP_STATE -}; - static inline int state_verbose(enum lock_usage_bit bit, struct lock_class *class) { - return state_verbose_f[bit >> 2](class); + if (bit < LOCK_USED_IN_SOFTIRQ) + return HARDIRQ_verbose(class); + else + return SOFTIRQ_verbose(class); } typedef int (*check_usage_f)(struct task_struct *, struct held_lock *, -- 2.21.0