diff options
author | Andi Kleen <ak@linux.intel.com> | 2015-12-01 20:00:57 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-12-06 06:56:03 -0500 |
commit | 153a4334c439cfb62e1d31cee0c790ba4157813d (patch) | |
tree | 08a73c43e71c233247ded660d7788cb03ac62ef4 | |
parent | da008ee72cabdee0ee98d3a3580ca5cfb8d2d1f1 (diff) |
x86/headers: Don't include asm/processor.h in asm/atomic.h
asm/atomic.h doesn't really need asm/processor.h anymore. Everything
it uses has moved to other header files. So remove that include.
processor.h is a nasty header that includes lots of
other headers and makes it prone to include loops. Removing the
include here makes asm/atomic.h a "leaf" header that can
be safely included in most other headers.
The only fallout is in the lib/atomic tester which relied on
this implicit include. Give it an explicit include.
(the include is in ifdef because the user is also in ifdef)
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: rostedt@goodmis.org
Link: http://lkml.kernel.org/r/1449018060-1742-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/include/asm/atomic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/atomic64_32.h | 1 | ||||
-rw-r--r-- | lib/atomic64_test.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index ae5fb83e6d91..3e8674288198 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <asm/processor.h> | ||
7 | #include <asm/alternative.h> | 6 | #include <asm/alternative.h> |
8 | #include <asm/cmpxchg.h> | 7 | #include <asm/cmpxchg.h> |
9 | #include <asm/rmwcc.h> | 8 | #include <asm/rmwcc.h> |
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index a11c30b77fb5..a984111135b1 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <asm/processor.h> | ||
7 | //#include <asm/cmpxchg.h> | 6 | //#include <asm/cmpxchg.h> |
8 | 7 | ||
9 | /* An 64bit atomic type */ | 8 | /* An 64bit atomic type */ |
diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c index 83c33a5bcffb..d51e25aa5f1d 100644 --- a/lib/atomic64_test.c +++ b/lib/atomic64_test.c | |||
@@ -16,6 +16,10 @@ | |||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/atomic.h> | 17 | #include <linux/atomic.h> |
18 | 18 | ||
19 | #ifdef CONFIG_X86 | ||
20 | #include <asm/processor.h> /* for boot_cpu_has below */ | ||
21 | #endif | ||
22 | |||
19 | #define TEST(bit, op, c_op, val) \ | 23 | #define TEST(bit, op, c_op, val) \ |
20 | do { \ | 24 | do { \ |
21 | atomic##bit##_set(&v, v0); \ | 25 | atomic##bit##_set(&v, v0); \ |