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

torvalds · torvalds · commit ac82a57aff85 · 2016-04-16T15:43:19.000-07:00
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
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1999,6 +1999,7 @@ static inline int get_first_held_lock(struct task_struct *curr,`
`1999`	`1999`	`return ++i;`
`2000`	`2000`	`}`
`2001`	`2001`
	`2002`	`+#ifdef CONFIG_DEBUG_LOCKDEP`
`2002`	`2003`	`/*`
`2003`	`2004`	`* Returns the next chain_key iteration`
`2004`	`2005`	`*/`
`@@ -2069,6 +2070,7 @@ static void print_collision(struct task_struct *curr,`
`2069`	`2070`	`printk("\nstack backtrace:\n");`
`2070`	`2071`	`dump_stack();`
`2071`	`2072`	`}`
	`2073`	`+#endif`
`2072`	`2074`
`2073`	`2075`	`/*`
`2074`	`2076`	`* Checks whether the chain and the current held locks are consistent`