r8169: remove private net_device_stats structure

[linux-2.6-omap-h63xx.git] / include / asm-x86 / system_64.h

diff --git a/include/asm-x86/system_64.h b/include/asm-x86/system_64.h
index 5022aecc333d7bfe6b24037b3927f15e745e4d7a..4cb23848d4605c436730c353c17c60728af8f373 100644 (file)
--- a/include/asm-x86/system_64.h
+++ b/include/asm-x86/system_64.h
@@ -7,9 +7,6 @@
 
 #ifdef __KERNEL__
 
-#define __STR(x) #x
-#define STR(x) __STR(x)
-
 #define __SAVE(reg,offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t"
 #define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"
 
@@ -85,7 +82,7 @@ static inline void write_cr0(unsigned long val)
 static inline unsigned long read_cr2(void)
 {
        unsigned long cr2;
-       asm("movq %%cr2,%0" : "=r" (cr2));
+       asm volatile("movq %%cr2,%0" : "=r" (cr2));
        return cr2;
 }
 
@@ -97,7 +94,7 @@ static inline void write_cr2(unsigned long val)
 static inline unsigned long read_cr3(void)
 { 
        unsigned long cr3;
-       asm("movq %%cr3,%0" : "=r" (cr3));
+       asm volatile("movq %%cr3,%0" : "=r" (cr3));
        return cr3;
 }
 
@@ -109,7 +106,7 @@ static inline void write_cr3(unsigned long val)
 static inline unsigned long read_cr4(void)
 { 
        unsigned long cr4;
-       asm("movq %%cr4,%0" : "=r" (cr4));
+       asm volatile("movq %%cr4,%0" : "=r" (cr4));
        return cr4;
 }
 
@@ -121,7 +118,7 @@ static inline void write_cr4(unsigned long val)
 static inline unsigned long read_cr8(void)
 {
        unsigned long cr8;
-       asm("movq %%cr8,%0" : "=r" (cr8));
+       asm volatile("movq %%cr8,%0" : "=r" (cr8));
        return cr8;
 }
 
@@ -137,6 +134,11 @@ static inline void write_cr8(unsigned long val)
 
 #endif /* __KERNEL__ */
 
+static inline void clflush(volatile void *__p)
+{
+       asm volatile("clflush %0" : "+m" (*(char __force *)__p));
+}
+
 #define nop() __asm__ __volatile__ ("nop")
 
 #ifdef CONFIG_SMP