x86: fix apic version warning

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

diff --git a/include/asm-x86/edac.h b/include/asm-x86/edac.h
index cf3200a745ad7b41e6925fb8ab5c7704cfb71fb3..9493c5b27bbdb4584bc60ff98b4fae0fd2dfc54f 100644 (file)
--- a/include/asm-x86/edac.h
+++ b/include/asm-x86/edac.h
@@ -1,9 +1,9 @@
-#ifndef _ASM_X86_EDAC_H
-#define _ASM_X86_EDAC_H
+#ifndef ASM_X86__EDAC_H
+#define ASM_X86__EDAC_H
 
 /* ECC atomic, DMA, SMP and interrupt safe scrub function */
 
-static __inline__ void atomic_scrub(void *va, u32 size)
+static inline void atomic_scrub(void *va, u32 size)
 {
        u32 i, *virt_addr = va;
 
@@ -12,7 +12,7 @@ static __inline__ void atomic_scrub(void *va, u32 size)
         * are interrupt, DMA and SMP safe.
         */
        for (i = 0; i < size / 4; i++, virt_addr++)
-               __asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+               asm volatile("lock; addl $0, %0"::"m" (*virt_addr));
 }
 
-#endif
+#endif /* ASM_X86__EDAC_H */