[PATCH 07/11] x86: move all simple arch settings to Kconfig

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

To: lkml <linux-kernel@...>

Cc: Sam Ravnborg <sam@...>

Subject: [PATCH 07/11] x86: move all simple arch settings to Kconfig

Date: Friday, November 9, 2007 - 7:20 pm

Most of the arch settings were equal so combine them
in the first part of Kconfig.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 arch/x86/Kconfig        |  136 +++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/Kconfig.i386   |  119 -----------------------------------------
 arch/x86/Kconfig.x86_64 |  115 ---------------------------------------
 3 files changed, 136 insertions(+), 234 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9fbb049..d47b5a2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,6 +1,86 @@
 # x86 configuration
 
 ### Arch settings
+config X86
+	bool
+	default y
+
+config 64BIT
+	def_bool X86_64
+
+config GENERIC_TIME
+	bool
+	default y
+
+config GENERIC_CMOS_UPDATE
+	bool
+	default y
+
+config CLOCKSOURCE_WATCHDOG
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+	bool
+	default y
+	depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
+
+config LOCKDEP_SUPPORT
+	bool
+	default y
+
+config STACKTRACE_SUPPORT
+	bool
+	default y
+
+config SEMAPHORE_SLEEPERS
+	bool
+	default y
+
+config MMU
+	bool
+	default y
+
+config ZONE_DMA
+	bool
+	default y
+
+config QUICKLIST
+	bool
+	default X86_32
+
+config SBUS
+	bool
+
+config GENERIC_ISA_DMA
+	bool
+	default y
+
+config GENERIC_IOMAP
+	bool
+	default y
+
+config GENERIC_BUG
+	bool
+	default y
+	depends on BUG
+
+config GENERIC_HWEIGHT
+	bool
+	default y
+
+config ARCH_MAY_HAVE_PC_FDC
+	bool
+	default y
+
+config DMI
+	bool
+	default y
+
 config RWSEM_GENERIC_SPINLOCK
 	def_bool !X86_XADD
 
@@ -16,6 +96,62 @@ config ARCH_HAS_ILOG2_U64
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
+config GENERIC_TIME_VSYSCALL
+	bool
+	default X86_64
+
+
+
+
+
+config ZONE_DMA32
+	bool
+	default X86_64
+
+config ARCH_POPULATES_NODE_MAP
+	def_bool y
+
+config AUDIT_ARCH
+	bool
+	default X86_64
+
+# Use the generic interrupt handling code in kernel/irq/:
+config GENERIC_HARDIRQS
+	bool
+	default y
+
+config GENERIC_IRQ_PROBE
+	bool
+	default y
+
+config GENERIC_PENDING_IRQ
+	bool
+	depends on GENERIC_HARDIRQS && SMP
+	default y
+
+config X86_SMP
+	bool
+	depends on X86_32 && SMP && !X86_VOYAGER
+	default y
+
+config X86_HT
+	bool
+	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
+	default y
+
+config X86_BIOS_REBOOT
+	bool
+	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+	default y
+
+config X86_TRAMPOLINE
+	bool
+	depends on X86_SMP || (X86_VOYAGER && SMP)
+	default y
+
+config KTIME_SCALAR
+	def_bool X86_32
+
 
 menu "Power management options"
 	depends on !X86_VOYAGER
diff --git a/arch/x86/Kconfig.i386 b/arch/x86/Kconfig.i386
index 3be7672..b8b462a 100644
--- a/arch/x86/Kconfig.i386
+++ b/arch/x86/Kconfig.i386
@@ -14,83 +14,6 @@ config X86_32
 	  486, 586, Pentiums, and various instruction-set-compatible chips by
 	  AMD, Cyrix, and others.
 
-config GENERIC_TIME
-	bool
-	default y
-
-config GENERIC_CMOS_UPDATE
-	bool
-	default y
-
-config CLOCKSOURCE_WATCHDOG
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-	default y
-	depends on X86_LOCAL_APIC
-
-config LOCKDEP_SUPPORT
-	bool
-	default y
-
-config STACKTRACE_SUPPORT
-	bool
-	default y
-
-config SEMAPHORE_SLEEPERS
-	bool
-	default y
-
-config X86
-	bool
-	default y
-
-config MMU
-	bool
-	default y
-
-config ZONE_DMA
-	bool
-	default y
-
-config QUICKLIST
-	bool
-	default y
-
-config SBUS
-	bool
-
-config GENERIC_ISA_DMA
-	bool
-	default y
-
-config GENERIC_IOMAP
-	bool
-	default y
-
-config GENERIC_BUG
-	bool
-	default y
-	depends on BUG
-
-config GENERIC_HWEIGHT
-	bool
-	default y
-
-config ARCH_MAY_HAVE_PC_FDC
-	bool
-	default y
-
-config DMI
-	bool
-	default y
-
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -837,9 +760,6 @@ config ARCH_SELECT_MEMORY_MODEL
 	def_bool y
 	depends on X86_32 && ARCH_SPARSEMEM_ENABLE
 
-config ARCH_POPULATES_NODE_MAP
-	def_bool y
-
 config ARCH_MEMORY_PROBE
 	def_bool X86_64
 	depends on MEMORY_HOTPLUG
@@ -1148,43 +1068,4 @@ config OUT_OF_LINE_PFN_TO_PAGE
 	def_bool X86_64
 	depends on DISCONTIGMEM
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-	bool
-	default y
-
-config GENERIC_IRQ_PROBE
-	bool
-	default y
-
-config GENERIC_PENDING_IRQ
-	bool
-	depends on GENERIC_HARDIRQS && SMP
-	default y
-
-config X86_SMP
-	bool
-	depends on X86_32 && SMP && !X86_VOYAGER
-	default y
-
-config X86_HT
-	bool
-	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
-	default y
-
-config X86_BIOS_REBOOT
-	bool
-	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
-	default y
-
-config X86_TRAMPOLINE
-	bool
-	depends on X86_SMP || (X86_VOYAGER && SMP)
-	default y
-
-config KTIME_SCALAR
-	def_bool X86_32
-
 source "arch/x86/Kconfig"
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64
index 36bb856..e441062 100644
--- a/arch/x86/Kconfig.x86_64
+++ b/arch/x86/Kconfig.x86_64
@@ -17,100 +17,6 @@ config X86_64
 	  classical 32-bit x86 architecture. For details see
 	  <http://www.x86-64.org/>.
 
-config 64BIT
-	def_bool X86_64
-
-config X86
-	bool
-	default y
-
-config GENERIC_TIME
-	bool
-	default y
-
-config GENERIC_TIME_VSYSCALL
-	bool
-	default y
-
-config GENERIC_CMOS_UPDATE
-	bool
-	default y
-
-config CLOCKSOURCE_WATCHDOG
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-	default y
-
-config ZONE_DMA32
-	bool
-	default y
-
-config LOCKDEP_SUPPORT
-	bool
-	default y
-
-config STACKTRACE_SUPPORT
-	bool
-	default y
-
-config SEMAPHORE_SLEEPERS
-	bool
-	default y
-
-config MMU
-	bool
-	default y
-
-config ZONE_DMA
-	bool
-	default y
-
-config ISA
-	bool
-
-config SBUS
-	bool
-
-config GENERIC_HWEIGHT
-	bool
-	default y
-
-config GENERIC_ISA_DMA
-	bool
-	default y
-
-config GENERIC_IOMAP
-	bool
-	default y
-
-config ARCH_MAY_HAVE_PC_FDC
-	bool
-	default y
-
-config ARCH_POPULATES_NODE_MAP
-	def_bool y
-
-config DMI
-	bool
-	default y
-
-config AUDIT_ARCH
-	bool
-	default y
-
-config GENERIC_BUG
-	bool
-	default y
-	depends on BUG
-
-
 source "init/Kconfig"
 
 
@@ -179,11 +85,6 @@ config X86_CPUID
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 
-config X86_HT
-	bool
-	depends on SMP && !MK8
-	default y
-
 config MATH_EMULATION
 	bool
 
@@ -606,20 +507,4 @@ config K8_NB
 
 endmenu
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-	bool
-	default y
-
-config GENERIC_IRQ_PROBE
-	bool
-	default y
-
-config GENERIC_PENDING_IRQ
-	bool
-	depends on GENERIC_HARDIRQS && SMP
-	default y
-
 source "arch/x86/Kconfig"
-- 
1.5.3.4.1157.g0e74-dirty

-
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[PATCH 0/11 v3] enable "make ARCH=x86", Sam Ravnborg, (Fri Nov 9, 7:08 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Frans Pop, (Mon Nov 12, 7:59 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Christoph Hellwig, (Sat Nov 10, 11:53 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Jeff Garzik, (Fri Nov 9, 11:23 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Sam Ravnborg, (Sat Nov 10, 3:54 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Jeff Garzik, (Sat Nov 10, 4:23 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Adrian Bunk, (Sat Nov 10, 6:13 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Paul Mundt, (Sat Nov 10, 4:21 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Adrian Bunk, (Sat Nov 10, 5:21 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Paul Mundt, (Sat Nov 10, 5:26 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Jeff Garzik, (Sat Nov 10, 4:24 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Sam Ravnborg, (Sat Nov 10, 5:39 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", , (Sat Nov 10, 6:32 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Paul Mundt, (Sat Nov 10, 4:44 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", H. Peter Anvin, (Sat Nov 10, 4:35 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Theodore Tso, (Sat Nov 10, 5:24 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Sam Ravnborg, (Sat Nov 10, 4:46 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Nick Piggin, (Sat Nov 10, 1:26 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Brian Gerst, (Sat Nov 10, 12:05 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Jeff Garzik, (Sat Nov 10, 12:12 am)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Roman Zippel, (Wed Nov 14, 4:13 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Adrian Bunk, (Fri Nov 9, 11:50 pm)

Re: [PATCH 0/11 v3] enable "make ARCH=x86", Randy Dunlap, (Fri Nov 9, 11:37 pm)

[PATCH 08/11] x86: move the rest of the menu's to Kconfig, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 09/11] x86: enable "make ARCH=x86", Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 10/11] x86: drop backward compatibility symlinks to i..., Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 04/11] x86: add X86_32 dependency to i386 specific sy..., Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 06/11] x86: copy x86_64 specific Kconfig symbols to K..., Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 02/11] x86: start unification of arch/x86/Kconfig.*, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 03/11] x86: arch/x86/Kconfig.cpu unification, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 07/11] x86: move all simple arch settings to Kconfig, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 11/11] kbuild: sanity check the specified arch, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 01/11] x86: unification of cfufreq/Kconfig, Sam Ravnborg, (Fri Nov 9, 7:20 pm)

[PATCH 05/11] x86: add X86_64 dependency to x86_64 specific ..., Sam Ravnborg, (Fri Nov 9, 7:20 pm)


linux-kernel:
Greg KH	[GIT PATCH] driver core patches against 2.6.24
Tarkan Erimer	Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3
Amit K. Arora	[RFC] Heads up on sys_fallocate()
Chuck Ebbert	Why do so many machines need "noapic"?
git:

linux-netdev:
Jarek Poplawski	[PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
David Miller	[GIT]: Networking
Gerrit Renker	[PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side)
Natalie Protasevich	[BUG] New Kernel Bugs
openbsd-misc: