Since #defined(CONFIG_PROVE_LOCKING) is used in the scope of #ifdef CONFIG_PROVE_LOCKING, it can be removed.
Unified · Split
| @@ -1674,7 +1674,7 @@ check_redundant(struct lock_list *root, struct lock_class *target, · 1673 unmodified lines | |||
| 1674 | return result; | 1674 | return result; |
| 1675 | } | 1675 | } |
| 1676 | 1676 | ||
| 1677 | #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) | 1677 | #ifdef CONFIG_TRACE_IRQFLAGS |
| 1678 | 1678 | ||
| 1679 | static inline int usage_accumulate(struct lock_list *entry, void *mask) | 1679 | static inline int usage_accumulate(struct lock_list *entry, void *mask) |
| 1680 | { | 1680 | { |
| @@ -2152,7 +2152,7 @@ static inline void inc_chains(void) · 471 unmodified lines | |||
| 2152 | nr_process_chains++; | 2152 | nr_process_chains++; |
| 2153 | } | 2153 | } |
| 2154 | 2154 | ||
| 2155 | #endif | 2155 | #endif /* CONFIG_TRACE_IRQFLAGS */ |
| 2156 | 2156 | ||
| 2157 | static void | 2157 | static void |
| 2158 | print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv) | 2158 | print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv) |
| @@ -2829,7 +2829,7 @@ static inline int validate_chain(struct task_struct *curr, · 670 unmodified lines | |||
| 2829 | { | 2829 | { |
| 2830 | return 1; | 2830 | return 1; |
| 2831 | } | 2831 | } |
| 2832 | #endif | 2832 | #endif /* CONFIG_PROVE_LOCKING */ |
| 2833 | 2833 | ||
| 2834 | /* | 2834 | /* |
| 2835 | * We are building curr_chain_key incrementally, so double-check | 2835 | * We are building curr_chain_key incrementally, so double-check |