---

yaml --- r: 71035 b: refs/heads/master c: 1f7afb0 h: refs/heads/master i: 71033: 8dafdd9 71031: 8c2b5ed v: v3
git-mirror · Oct 17, 2007 · 4287f4e · 4287f4e
1 parent 1d80dd4
commit 4287f4e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 41 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 327c21bc3d347d545d227103d7cc58039ab8a0be
+refs/heads/master: 1f7afb08a595292d946a5f1fd4929c81db7042d2
diff --git a/trunk/include/asm-x86/edac.h b/trunk/include/asm-x86/edac.h
@@ -1,5 +1,18 @@
-#ifdef CONFIG_X86_32
-# include "edac_32.h"
-#else
-# include "edac_64.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)
+{
+	u32 i, *virt_addr = va;
+
+	/*
+	 * Very carefully read and write to memory atomically so we
+	 * are interrupt, DMA and SMP safe.
+	 */
+	for (i = 0; i < size / 4; i++, virt_addr++)
+		__asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+}
+
 #endif
diff --git a/trunk/include/asm-x86/edac_32.h b/trunk/include/asm-x86/edac_32.h
diff --git a/trunk/include/asm-x86/edac_64.h b/trunk/include/asm-x86/edac_64.h