diff --git a/[refs] b/[refs]
index 8f091ccedc0c..4077518abf40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86bbc83526a4543db0a4ffed8e4cf679eddd534c
+refs/heads/master: 451dd9835898d4cc3c0ee8f9e4883807b760eb02
diff --git a/trunk/include/asm-x86/edac.h b/trunk/include/asm-x86/edac.h
index cf3200a745ad..a8088f63a30e 100644
--- a/trunk/include/asm-x86/edac.h
+++ b/trunk/include/asm-x86/edac.h
@@ -3,7 +3,7 @@
 
 /* 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