Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH 29/38] Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h [ver #3] | Date | Thu, 15 Mar 2012 20:59:49 +0000 |
| |
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h as all arch files that #include the former also #include the latter. See:
grep -rl asm-generic/cmpxchg-local[.]h arch/ | sort > b grep -rl asm-generic/cmpxchg[.]h arch/ | sort > a comm a b
This simplifies the disintegration of asm-generic/system.h for arches that don't have their own.
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> ---
include/asm-generic/atomic.h | 2 ++ include/asm-generic/cmpxchg.h | 2 ++ include/asm-generic/system.h | 1 - 3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index e37963c..8b8cf94 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -15,6 +15,8 @@ #ifndef __ASM_GENERIC_ATOMIC_H #define __ASM_GENERIC_ATOMIC_H +#include <asm/cmpxchg.h> + #ifdef CONFIG_SMP /* Force people to define core atomics */ # if !defined(atomic_add_return) || !defined(atomic_sub_return) || \ diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h index 213ac6e..e0449af 100644 --- a/include/asm-generic/cmpxchg.h +++ b/include/asm-generic/cmpxchg.h @@ -10,6 +10,8 @@ #error "Cannot use generic cmpxchg on SMP" #endif +#include <asm-generic/cmpxchg-local.h> + /* * Atomic compare and exchange. * diff --git a/include/asm-generic/system.h b/include/asm-generic/system.h index 215efa7..82cb53a 100644 --- a/include/asm-generic/system.h +++ b/include/asm-generic/system.h @@ -19,7 +19,6 @@ #include <linux/types.h> #include <linux/irqflags.h> -#include <asm/cmpxchg-local.h> #include <asm/cmpxchg.h> struct task_struct;
| |