diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 23:28:20 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:17:19 +0200 |
commit | 1f7afb08a595292d946a5f1fd4929c81db7042d2 (patch) | |
tree | 42bc30a41de142a28bde7f17b5a92139fc327a79 /include/asm-x86/edac.h | |
parent | 327c21bc3d347d545d227103d7cc58039ab8a0be (diff) | |
download | talos-op-linux-1f7afb08a595292d946a5f1fd4929c81db7042d2.tar.gz talos-op-linux-1f7afb08a595292d946a5f1fd4929c81db7042d2.zip |
x86: unify include/asm/cache_32/64.h
Same file, except for whitespace, comment formatting and:
32-bit: unsigned long *virt_addr = va;
64-bit: unsigned int *virt_addr = va;
Both can be safely replaced by:
u32 i, *virt_addr = va;
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/edac.h')
-rw-r--r-- | include/asm-x86/edac.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/include/asm-x86/edac.h b/include/asm-x86/edac.h index f8b888e140b0..cf3200a745ad 100644 --- a/include/asm-x86/edac.h +++ b/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 |