Commit ac82a57a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fixlet from Ingo Molnar:
 "Fixes a build warning on certain Kconfig combinations"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix print_collision() unused warning
parents e2f50c5c 5c8a010c

kernel/locking/lockdep.c

+2 −0
Original line number Diff line number Diff line
@@ -1999,6 +1999,7 @@ static inline int get_first_held_lock(struct task_struct *curr, 
	return ++i;

}



#ifdef CONFIG_DEBUG_LOCKDEP

/*

 * Returns the next chain_key iteration

 */
@@ -2069,6 +2070,7 @@ static void print_collision(struct task_struct *curr, 
	printk("\nstack backtrace:\n");

	dump_stack();

}

#endif



/*

 * Checks whether the chain and the current held locks are consistent

CRA Git | Maintained and supported by SUSTech CRA and CCSE