Commit e7a38f63 authored by Yuyang Du's avatar Yuyang Du Committed by Ingo Molnar

locking/lockdep: Remove useless conditional macro

Since #defined(CONFIG_PROVE_LOCKING) is used in the scope of #ifdef
CONFIG_PROVE_LOCKING, it can be removed.
Signed-off-by: default avatarYuyang Du <duyuyang@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bvanassche@acm.org
Cc: frederic@kernel.org
Cc: ming.lei@redhat.com
Cc: will.deacon@arm.com
Link: https://lkml.kernel.org/r/20190506081939.74287-5-duyuyang@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c52478f4
...@@ -1674,7 +1674,7 @@ check_redundant(struct lock_list *root, struct lock_class *target, ...@@ -1674,7 +1674,7 @@ check_redundant(struct lock_list *root, struct lock_class *target,
return result; return result;
} }
#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) #ifdef CONFIG_TRACE_IRQFLAGS
static inline int usage_accumulate(struct lock_list *entry, void *mask) static inline int usage_accumulate(struct lock_list *entry, void *mask)
{ {
...@@ -2152,7 +2152,7 @@ static inline void inc_chains(void) ...@@ -2152,7 +2152,7 @@ static inline void inc_chains(void)
nr_process_chains++; nr_process_chains++;
} }
#endif #endif /* CONFIG_TRACE_IRQFLAGS */
static void static void
print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv) print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv)
...@@ -2829,7 +2829,7 @@ static inline int validate_chain(struct task_struct *curr, ...@@ -2829,7 +2829,7 @@ static inline int validate_chain(struct task_struct *curr,
{ {
return 1; return 1;
} }
#endif #endif /* CONFIG_PROVE_LOCKING */
/* /*
* We are building curr_chain_key incrementally, so double-check * We are building curr_chain_key incrementally, so double-check
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment