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@xxxxxxxxxx> cc: Arnd Bergmann <arnd@xxxxxxxx> --- include/asm-generic/cmpxchg.h | 2 ++ include/asm-generic/system.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) 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; -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html