| Message ID | 20190628102919.2345242-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 30a35f79faadfeb1b89a7fdb3875f14063519041 |
| Headers | show |
| Series | locking/lockdep: clean up #ifdef checks | expand |
Hi Arnd, On Fri, Jun 28, 2019 at 12:29:03PM +0200, Arnd Bergmann wrote: > As Will Deacon points out, CONFIG_PROVE_LOCKING implies TRACE_IRQFLAGS, > so the conditions I added in the previous patch, and some others in the > same file can be simplified by only checking for the former. > > No functional change. > > Fixes: 886532aee3cd ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > kernel/locking/lockdep.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) Thanks for following up on this. I think it makes the code easier to read, so: Acked-by: Will Deacon <will@kernel.org> Will
On Fri, Jun 28, 2019 at 12:03:54PM +0100, Will Deacon wrote: > Hi Arnd, > > On Fri, Jun 28, 2019 at 12:29:03PM +0200, Arnd Bergmann wrote: > > As Will Deacon points out, CONFIG_PROVE_LOCKING implies TRACE_IRQFLAGS, > > so the conditions I added in the previous patch, and some others in the > > same file can be simplified by only checking for the former. > > > > No functional change. > > > > Fixes: 886532aee3cd ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > kernel/locking/lockdep.c | 13 ++++++------- > > 1 file changed, 6 insertions(+), 7 deletions(-) > > Thanks for following up on this. I think it makes the code easier to read, > so: > > Acked-by: Will Deacon <will@kernel.org> Thanks guys!
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 341f52117f88..4861cf8e274b 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -448,7 +448,7 @@ static void print_lockdep_off(const char *bug_msg) unsigned long nr_stack_trace_entries; -#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) +#ifdef CONFIG_PROVE_LOCKING /* * Stack-trace: tightly packed array of stack backtrace * addresses. Protected by the graph_lock. @@ -491,7 +491,7 @@ unsigned int max_lockdep_depth; DEFINE_PER_CPU(struct lockdep_stats, lockdep_stats); #endif -#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) +#ifdef CONFIG_PROVE_LOCKING /* * Locking printouts: */ @@ -2969,7 +2969,7 @@ static void check_chain_key(struct task_struct *curr) #endif } -#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) +#ifdef CONFIG_PROVE_LOCKING static int mark_lock(struct task_struct *curr, struct held_lock *this, enum lock_usage_bit new_bit); @@ -3608,7 +3608,7 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, return ret; } -#else /* defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) */ +#else /* CONFIG_PROVE_LOCKING */ static inline int mark_usage(struct task_struct *curr, struct held_lock *hlock, int check) @@ -3627,7 +3627,7 @@ static inline int separate_irq_context(struct task_struct *curr, return 0; } -#endif /* defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING) */ +#endif /* CONFIG_PROVE_LOCKING */ /* * Initialize a lock instance's lock-class mapping info: @@ -4321,8 +4321,7 @@ static void __lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie cookie */ static void check_flags(unsigned long flags) { -#if defined(CONFIG_PROVE_LOCKING) && defined(CONFIG_DEBUG_LOCKDEP) && \ - defined(CONFIG_TRACE_IRQFLAGS) +#if defined(CONFIG_PROVE_LOCKING) && defined(CONFIG_DEBUG_LOCKDEP) if (!debug_locks) return;
As Will Deacon points out, CONFIG_PROVE_LOCKING implies TRACE_IRQFLAGS, so the conditions I added in the previous patch, and some others in the same file can be simplified by only checking for the former. No functional change. Fixes: 886532aee3cd ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- kernel/locking/lockdep.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.20.0