2011-03-04 14:57:54

by Jan Beulich

[permalink] [raw]
Subject: [PATCH] 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

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

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

--- 2.6.38-rc7/arch/x86/Kconfig
+++ 2.6.38-rc7-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-rc7/arch/x86/Kconfig.cpu
+++ 2.6.38-rc7-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-04 16:01:21

by Jan Beulich

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

Commit-ID: 24a2a35a18ebc4e143e86ad3fda50ee78de30d06
Gitweb: http://git.kernel.org/tip/24a2a35a18ebc4e143e86ad3fda50ee78de30d06
Author: Jan Beulich <[email protected]>
AuthorDate: Fri, 4 Mar 2011 14:57:48 +0000
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 4 Mar 2011 16:34:33 +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

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

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

2011-03-05 08:29:34

by Ingo Molnar

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


* tip-bot for Jan Beulich <[email protected]> wrote:

> Commit-ID: 24a2a35a18ebc4e143e86ad3fda50ee78de30d06
> Gitweb: http://git.kernel.org/tip/24a2a35a18ebc4e143e86ad3fda50ee78de30d06
> Author: Jan Beulich <[email protected]>
> AuthorDate: Fri, 4 Mar 2011 14:57:48 +0000
> Committer: Ingo Molnar <[email protected]>
> CommitDate: Fri, 4 Mar 2011 16:34:33 +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

This broke UML ...

mm/built-in.o: In function `vm_unmap_aliases':
/home/mingo/tip/mm/vmalloc.c:989: undefined reference to `find_next_bit'
/home/mingo/tip/mm/vmalloc.c:993: undefined reference to `find_next_zero_bit'
/home/mingo/tip/mm/vmalloc.c:1006: undefined reference to `find_next_bit'

Thanks,

Ingo