diff options
| author | David Howells <dhowells@redhat.com> | 2012-03-28 19:30:03 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-03-28 19:30:03 +0200 |
| commit | 34484277b173d0af1bb00532a264940b57920429 (patch) | |
| tree | d3cb2984acf58bfcd08a1f1a67c8e291272418a0 /include/asm-generic | |
| parent | Disintegrate asm/system.h for Xtensa (diff) | |
| download | linux-34484277b173d0af1bb00532a264940b57920429.tar.xz linux-34484277b173d0af1bb00532a264940b57920429.zip | |
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
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>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/atomic.h | 2 | ||||
| -rw-r--r-- | include/asm-generic/cmpxchg.h | 2 | ||||
| -rw-r--r-- | 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 e37963c1df4d..8b8cf9412989 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 213ac6e8fe39..e0449af91f60 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 215efa74f5a2..82cb53abb9f6 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; |