[PATCH] md: improve raid10 "IO Barrier" concept

[~andy/linux] / include / asm-arm / atomic.h

diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index d8ba0a9eb0852b4d9927ddc2c2cd20141fd3d063..f72b63309bc5c80b54fd0f9dc27a46f56a47c0e5 100644 (file)
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -83,7 +83,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 
 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 {
-       u32 oldval, res;
+       unsigned long oldval, res;
 
        do {
                __asm__ __volatile__("@ atomic_cmpxchg\n"
@@ -205,5 +205,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__before_atomic_inc()    barrier()
 #define smp_mb__after_atomic_inc()     barrier()
 
+#include <asm-generic/atomic.h>
 #endif
 #endif