[PATCH v2 04/23] locking/lockdep: Remove useless conditional macro

From: Yuyang Du
Date: Mon May 06 2019 - 04:20:42 EST


Since #defined(CONFIG_PROVE_LOCKING) is used in the scope of #ifdef
CONFIG_PROVE_LOCKING, it can be removed.

Signed-off-by: Yuyang Du <duyuyang@xxxxxxxxx>
---
kernel/locking/lockdep.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 720d195..a0837a0 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -1669,7 +1669,7 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class)
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)
{
@@ -2147,7 +2147,7 @@ static inline void inc_chains(void)
nr_process_chains++;
}

-#endif
+#endif /* CONFIG_TRACE_IRQFLAGS */

static void
print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv)
@@ -2828,7 +2828,7 @@ static inline int validate_chain(struct task_struct *curr,
static void print_lock_trace(struct lock_trace *trace, unsigned int spaces)
{
}
-#endif
+#endif /* CONFIG_PROVE_LOCKING */

/*
* We are building curr_chain_key incrementally, so double-check
--
1.8.3.1