2011-03-08 09:24:36

by Jan Beulich

Subject: [PATCH, v2] x86: remove dead config option X86_CPU

This isn't being referenced anywhere, and the selects done from it can
be easily done together with all the other X86 ones.

v2: Also adjust UML's Kconfig.x86.

Signed-off-by: Jan Beulich <[email protected]>

---
arch/um/Kconfig.x86 | 2 ++
arch/x86/Kconfig | 2 ++
arch/x86/Kconfig.cpu | 5 -----
3 files changed, 4 insertions(+), 5 deletions(-)

--- 2.6.38-rc8/arch/um/Kconfig.x86
+++ 2.6.38-rc8-x86-remove-X86_CPU/arch/um/Kconfig.x86
@@ -10,6 +10,8 @@ endmenu

config UML_X86
def_bool y
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_FIND_NEXT_BIT

config 64BIT
bool
--- 2.6.38-rc8/arch/x86/Kconfig
+++ 2.6.38-rc8-x86-remove-X86_CPU/arch/x86/Kconfig
@@ -64,6 +64,8 @@ config X86
select HAVE_TEXT_POKE_SMP
select HAVE_GENERIC_HARDIRQS
select HAVE_SPARSE_IRQ
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_FIND_NEXT_BIT
select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP
select USE_GENERIC_SMP_HELPERS if SMP
--- 2.6.38-rc8/arch/x86/Kconfig.cpu
+++ 2.6.38-rc8-x86-remove-X86_CPU/arch/x86/Kconfig.cpu
@@ -294,11 +294,6 @@ config X86_GENERIC

endif

-config X86_CPU
- def_bool y
- select GENERIC_FIND_FIRST_BIT
- select GENERIC_FIND_NEXT_BIT
-
#
# Define implied options from the CPU selection here
config X86_INTERNODE_CACHE_SHIFT

2011-03-09 11:23:16

by Jan Beulich

Subject: [tip:x86/asm] x86: Remove dead config option X86_CPU

Commit-ID: c49aa5bd1376939b40759a6da5ba6cf701702721
Gitweb: http://git.kernel.org/tip/c49aa5bd1376939b40759a6da5ba6cf701702721
Author: Jan Beulich <[email protected]>
AuthorDate: Tue, 8 Mar 2011 09:24:26 +0000
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 9 Mar 2011 10:39:36 +0100

x86: Remove dead config option X86_CPU

This isn't being referenced anywhere, and the selects done from
it can be easily done together with all the other X86 ones.

v2: Also adjust UML's Kconfig.x86.

Signed-off-by: Jan Beulich <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/um/Kconfig.x86 | 2 ++
arch/x86/Kconfig | 2 ++
arch/x86/Kconfig.cpu | 5 -----
3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 62f2115..02fb017 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -10,6 +10,8 @@ endmenu

config UML_X86
def_bool y
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_FIND_NEXT_BIT

config 64BIT
bool
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d5ed94d..43214e3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -64,6 +64,8 @@ config X86
select HAVE_TEXT_POKE_SMP
select HAVE_GENERIC_HARDIRQS
select HAVE_SPARSE_IRQ
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_FIND_NEXT_BIT
select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP
select USE_GENERIC_SMP_HELPERS if SMP
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 283c5a6..ed47e6e 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -294,11 +294,6 @@ config X86_GENERIC

endif

-config X86_CPU
- def_bool y
- select GENERIC_FIND_FIRST_BIT
- select GENERIC_FIND_NEXT_BIT
-
#
# Define implied options from the CPU selection here
config X86_INTERNODE_CACHE_SHIFT