Commit 84fb144b authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86: reintroduce volatile keyword in prototype to clflush()

The volatile keyword was removed from the clflush() prototype
in commit e34907ae

; the comment there

    x86: remove volatile keyword from clflush.

    the p parameter is an explicit memory reference, and is
    enough to prevent gcc to being nasty here. The volatile
    seems completely not needed.

This reflects incorrect understanding of the function of the volatile
keyword there.  The purpose of the volatile keyword is informing gcc
that it is safe to pass a volatile pointer to this function.
Signed-off-by: default avatarH. Peter Anvin <>
Signed-off-by: default avatarIngo Molnar <>
Signed-off-by: default avatarThomas Gleixner <>
parent 2b06ac86
...@@ -271,9 +271,9 @@ static inline void native_wbinvd(void) ...@@ -271,9 +271,9 @@ static inline void native_wbinvd(void)
#endif /* __KERNEL__ */ #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") #define nop() __asm__ __volatile__ ("nop")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment