diff --git a/[refs] b/[refs]
index c7fbdf1206fd..b6aeca53d240 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c1721aa4994f6625decbd915241f3a94ee2fe67
+refs/heads/master: fa4062e7eae8f484c90b9cdd850b5df39ab0e5a0
diff --git a/trunk/lib/kernel_lock.c b/trunk/lib/kernel_lock.c
index fdd23cdb53f3..b135d04aa48a 100644
--- a/trunk/lib/kernel_lock.c
+++ b/trunk/lib/kernel_lock.c
@@ -23,7 +23,7 @@
  *
  * Don't use in new code.
  */
-static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag);
+static  __cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(kernel_flag);
 
 
 /*
@@ -82,7 +82,7 @@ static inline void __lock_kernel(void)
 		 */
 		do {
 			preempt_enable();
-			while (spin_is_locked(&kernel_flag))
+			while (raw_spin_is_locked(&kernel_flag))
 				cpu_relax();
 			preempt_disable();
 		} while (!do_raw_spin_trylock(&kernel_flag));