2 files changed, 24 insertions, 0 deletions

diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h
index de649d3aa2d..e2c00c95a5e 100644
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -255,5 +255,17 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
 
+/* ECC atomic, DMA, SMP and interrupt safe scrub function */
+
+static __inline__ void atomic_scrub(unsigned long *virt_addr, u32 size)
+{
+        u32 i;
+        for (i = 0; i < size / 4; i++, virt_addr++)
+                /* Very carefully read and write to memory atomically
+                 * so we are interrupt, DMA and SMP safe.
+                 */
+                __asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+}
+
 #include <asm-generic/atomic.h>
 #endif
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86_64/atomic.h
index 4b5cd553e77..4048508c4f4 100644
--- a/include/asm-x86_64/atomic.h
+++ b/include/asm-x86_64/atomic.h
@@ -426,5 +426,17 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
 
+/* ECC atomic, DMA, SMP and interrupt safe scrub function */
+
+static __inline__ void atomic_scrub(u32 *virt_addr, u32 size)
+{
+        u32 i;
+        for (i = 0; i < size / 4; i++, virt_addr++)
+                /* Very carefully read and write to memory atomically
+                 * so we are interrupt, DMA and SMP safe.
+                 */
+                __asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+}
+
 #include <asm-generic/atomic.h>
 #endif