From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756154AbbLDL7p (ORCPT ); Fri, 4 Dec 2015 06:59:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60342 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752349AbbLDL7o (ORCPT ); Fri, 4 Dec 2015 06:59:44 -0500 Date: Fri, 4 Dec 2015 03:58:59 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: eranian@google.com, hpa@zytor.com, jolsa@redhat.com, torvalds@linux-foundation.org, acme@redhat.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, ak@linux.intel.com, efault@gmx.de, mingo@kernel.org Reply-To: efault@gmx.de, ak@linux.intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, vincent.weaver@maine.edu, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, jolsa@redhat.com, acme@redhat.com, eranian@google.com, hpa@zytor.com In-Reply-To: <1449018060-1742-1-git-send-email-andi@firstfloor.org> References: <1449018060-1742-1-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] x86/headers: Don't include asm/processor.h in asm /atomic.h Git-Commit-ID: d8cc58c8a099bb36371f4e4807fd6d34b301808f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d8cc58c8a099bb36371f4e4807fd6d34b301808f Gitweb: http://git.kernel.org/tip/d8cc58c8a099bb36371f4e4807fd6d34b301808f Author: Andi Kleen AuthorDate: Tue, 1 Dec 2015 17:00:57 -0800 Committer: Ingo Molnar CommitDate: Fri, 4 Dec 2015 10:58:33 +0100 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: rostedt@goodmis.org Link: http://lkml.kernel.org/r/1449018060-1742-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/atomic.h | 1 - arch/x86/include/asm/atomic64_32.h | 1 - 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 ae5fb83..3e86742 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index a11c30b..a984111 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h @@ -3,7 +3,6 @@ #include #include -#include //#include /* An 64bit atomic type */ diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c index 83c33a5b..d51e25a 100644 --- a/lib/atomic64_test.c +++ b/lib/atomic64_test.c @@ -16,6 +16,10 @@ #include #include +#ifdef CONFIG_X86 +#include /* for boot_cpu_has below */ +#endif + #define TEST(bit, op, c_op, val) \ do { \ atomic##bit##_set(&v, v0); \