From: tip-bot for Sudeep Holla <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org,
bp@alien8.de, linux-kernel@vger.kernel.org, sudeep.holla@arm.com,
torvalds@linux-foundation.org, tglx@linutronix.de,
luto@amacapital.net, brgerst@gmail.com, peterz@infradead.org,
bp@suse.de
Subject: [tip:x86/cpu] x86/topology: Remove redundant ENABLE_TOPO_DEFINES
Date: Thu, 5 May 2016 02:37:52 -0700 [thread overview]
Message-ID: <tip-3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead@git.kernel.org> (raw)
In-Reply-To: <1462380659-5968-1-git-send-email-sudeep.holla@arm.com>
Commit-ID: 3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead
Gitweb: http://git.kernel.org/tip/3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead
Author: Sudeep Holla <sudeep.holla@arm.com>
AuthorDate: Wed, 4 May 2016 17:50:59 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 5 May 2016 08:42:48 +0200
x86/topology: Remove redundant ENABLE_TOPO_DEFINES
Commit c8e56d20f2d1 ("x86: Kill CONFIG_X86_HT") removed CONFIG_X86_HT
and defined ENABLE_TOPO_DEFINES always if CONFIG_SMP, which makes
ENABLE_TOPO_DEFINES redundant.
This patch removes the redundant ENABLE_TOPO_DEFINES and instead uses
CONFIG_SMP directly
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1462380659-5968-1-git-send-email-sudeep.holla@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/topology.h | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 7f991bd5..c9a4ed7 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -25,16 +25,6 @@
#ifndef _ASM_X86_TOPOLOGY_H
#define _ASM_X86_TOPOLOGY_H
-#ifdef CONFIG_X86_32
-# ifdef CONFIG_SMP
-# define ENABLE_TOPO_DEFINES
-# endif
-#else
-# ifdef CONFIG_SMP
-# define ENABLE_TOPO_DEFINES
-# endif
-#endif
-
/*
* to preserve the visibility of NUMA_NO_NODE definition,
* moved to there from here. May be used independent of
@@ -123,7 +113,7 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
-#ifdef ENABLE_TOPO_DEFINES
+#ifdef CONFIG_SMP
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
#define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
prev parent reply other threads:[~2016-05-05 9:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 16:50 [PATCH] x86/topology: remove redundant ENABLE_TOPO_DEFINES Sudeep Holla
2016-05-04 17:02 ` Borislav Petkov
2016-05-05 9:37 ` tip-bot for Sudeep Holla [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-3282e6b8f89eaeaf4915ee6cc57bcf06d1d6cead@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sudeep.holla@arm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox