Commit:     84fb144b928744cea8eb39bb4fbc794fcb749175
Parent:     2b06ac867176d5d24757bda7e13f6255d6b96d7b
Author:     H. Peter Anvin <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 16:48:00 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Mon Feb 4 16:48:00 2008 +0100

    x86: reintroduce volatile keyword in prototype to clflush()
    The volatile keyword was removed from the clflush() prototype
    in commit e34907ae180f4fe6c28bb4516c679c2f81b0c9ed; 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: H. Peter Anvin <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 include/asm-x86/system.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index 428348e..e9c15c9 100644
--- a/include/asm-x86/system.h
+++ b/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")
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to