Merge commit 'v2.6.37-rc1' into for-2.6.37

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h
index 2ea1dd1ba21c..291f721144c2 100644
--- a/include/linux/smp_lock.h
+++ b/include/linux/smp_lock.h
@@ -54,12 +54,15 @@ static inline void cycle_kernel_lock(void)
 
 #else
 
+#ifdef CONFIG_BKL /* provoke build bug if not set */
 #define lock_kernel()
 #define unlock_kernel()
-#define release_kernel_lock(task)               do { } while(0)
 #define cycle_kernel_lock()                     do { } while(0)
-#define reacquire_kernel_lock(task)             0
 #define kernel_locked()                         1
+#endif /* CONFIG_BKL */
+
+#define release_kernel_lock(task)               do { } while(0)
+#define reacquire_kernel_lock(task)             0
 
 #endif /* CONFIG_LOCK_KERNEL */
 #endif /* __LINUX_SMPLOCK_H */