diff --git a/[refs] b/[refs] index 8b285a348ef7..15bf7c125211 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 929fd589135ed417663f1b75b8031c9cf6687700 +refs/heads/master: e34907ae180f4fe6c28bb4516c679c2f81b0c9ed diff --git a/trunk/include/asm-x86/system_32.h b/trunk/include/asm-x86/system_32.h index f5b3f77f5310..28978b17b07a 100644 --- a/trunk/include/asm-x86/system_32.h +++ b/trunk/include/asm-x86/system_32.h @@ -161,7 +161,7 @@ static inline void native_wbinvd(void) asm volatile("wbinvd": : :"memory"); } -static inline void clflush(volatile void *__p) +static inline void clflush(void *__p) { asm volatile("clflush %0" : "+m" (*(char __force *)__p)); }