Commit 30a35f79 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ingo Molnar
Browse files

locking/lockdep: Clean up #ifdef checks 



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.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Frederic Weisbecker <frederic@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: Yuyang Du <duyuyang@gmail.com>
Fixes: 886532ae ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING")
Link: https://lkml.kernel.org/r/20190628102919.2345242-1-arnd@arndb.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 68037aa7

kernel/locking/lockdep.c

+6 −7
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE