Re: [PATCH 1/3] atomic: use <linux/atomic.h>
From: Arun Sharma
Date: Wed Jun 15 2011 - 20:56:30 EST
On 6/15/11 4:31 PM, Andrew Morton wrote:
I didn't merge patch #3. With patches 1& 2 applied, i386 allnoconfig:
Dropping patch#3 is fine, since Eric removed the primitive. For this
problem, I'm testing a patch along the lines of:
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -318,5 +318,4 @@ static inline void atomic_or_long(unsigned long *v1,
unsigned long v2)
# include "atomic64_64.h"
#endif
-#include <asm-generic/atomic-long.h>
#endif /* _ASM_X86_ATOMIC_H */
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -85,4 +85,8 @@ static inline void atomic_or(int i, atomic_t *v)
}
#endif /* #ifndef CONFIG_ARCH_HAS_ATOMIC_OR */
+#include <asm-generic/atomic-long.h>
+#ifdef CONFIG_GENERIC_ATOMIC64
+#include <asm-generic/atomic64.h>
+#endif
#endif /* _LINUX_ATOMIC_H */
.. repeated for all other archs.
-Arun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/