diff --git a/[refs] b/[refs]
index f079e502bca8..2a238e1f812e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f03d6ce4ee20e7521b69188f6b5a9bb9ba7457f
+refs/heads/master: 267eb01a62b1190d0bf87b1ef3b0c9d21cdb2c57
diff --git a/trunk/include/asm-i386/mc146818rtc.h b/trunk/include/asm-i386/mc146818rtc.h
index 99a890047023..1613b42eaf58 100644
--- a/trunk/include/asm-i386/mc146818rtc.h
+++ b/trunk/include/asm-i386/mc146818rtc.h
@@ -6,6 +6,7 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/processor.h>
 #include <linux/mc146818rtc.h>
 
 #ifndef RTC_PORT
@@ -43,8 +44,10 @@ static inline void lock_cmos(unsigned char reg)
 	unsigned long new;
 	new = ((smp_processor_id()+1) << 8) | reg;
 	for (;;) {
-		if (cmos_lock)
+		if (cmos_lock) {
+			cpu_relax();
 			continue;
+		}
 		if (__cmpxchg(&cmos_lock, 0, new, sizeof(cmos_lock)) == 0)
 			return;
 	}