diff --git a/[refs] b/[refs]
index d06ad4e9edbb..8b6df62fca71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b06ac867176d5d24757bda7e13f6255d6b96d7b
+refs/heads/master: 84fb144b928744cea8eb39bb4fbc794fcb749175
diff --git a/trunk/include/asm-x86/system.h b/trunk/include/asm-x86/system.h
index 428348e990bf..e9c15c97dfe2 100644
--- a/trunk/include/asm-x86/system.h
+++ b/trunk/include/asm-x86/system.h
@@ -271,9 +271,9 @@ static inline void native_wbinvd(void)
 
 #endif /* __KERNEL__ */
 
-static inline void clflush(void *__p)
+static inline void clflush(volatile void *__p)
 {
-	asm volatile("clflush %0" : "+m" (*(char __force *)__p));
+	asm volatile("clflush %0" : "+m" (*(volatile char __force *)__p));
 }
 
 #define nop() __asm__ __volatile__ ("nop")