Re: [RFC - GIT pull] first step to get rid of x86_64 and i386 dirs

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Sam Ravnborg <sam@...>
Cc: Ingo Molnar <mingo@...>, Christoph Hellwig <hch@...>, Linus Torvalds <torvalds@...>, Linux Kernel Mailing List <linux-kernel@...>, Thomas Gleixner <tglx@...>, H. Peter Anvin <hpa@...>
Date: Wednesday, October 24, 2007 - 6:50 pm

On Wed, 24 Oct 2007 23:30:52 +0200 Sam Ravnborg wrote:


Uh, maybe I jumped too far.  I merged the 2 x86 Kconfig.debug files
into arch/x86/Kconfig.debug....

---

From: Randy Dunlap <randy.dunlap@oracle.com>

Merge i386/Kconfig.debug and x86_64/Kconfig.debug into x86/Kconfig.debug,
using "depends on X86_32" or X86_64 when needed.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/i386/Kconfig.debug   |   88 ----------------------------------
 arch/x86/Kconfig.debug    |  119 ++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86_64/Kconfig.debug |   61 -----------------------
 3 files changed, 119 insertions(+), 149 deletions(-)

--- linux-2.6.24-rc1.orig/arch/i386/Kconfig.debug
+++ /dev/null
@@ -1,88 +0,0 @@
-menu "Kernel hacking"
-
-config TRACE_IRQFLAGS_SUPPORT
-	bool
-	default y
-
-source "lib/Kconfig.debug"
-
-config EARLY_PRINTK
-	bool "Early printk" if EMBEDDED && DEBUG_KERNEL
-	default y
-	help
-	  Write kernel log output directly into the VGA buffer or to a serial
-	  port.
-
-	  This is useful for kernel debugging when your machine crashes very
-	  early before the console code is initialized. For normal operation
-	  it is not recommended because it looks ugly and doesn't cooperate
-	  with klogd/syslogd or the X server. You should normally N here,
-	  unless you want to debug such a crash.
-
-config DEBUG_STACKOVERFLOW
-	bool "Check for stack overflows"
-	depends on DEBUG_KERNEL
-	help
-	  This option will cause messages to be printed if free stack space
-	  drops below a certain limit.
-
-config DEBUG_STACK_USAGE
-	bool "Stack utilization instrumentation"
-	depends on DEBUG_KERNEL
-	help
-	  Enables the display of the minimum amount of free stack which each
-	  task has ever had available in the sysrq-T and sysrq-P debug output.
-
-	  This option will slow down process creation somewhat.
-
-comment "Page alloc debug is incompatible with Software Suspend on i386"
-	depends on DEBUG_KERNEL && HIBERNATION
-
-config DEBUG_PAGEALLOC
-	bool "Debug page memory allocations"
-	depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS
-	help
-	  Unmap pages from the kernel linear mapping after free_pages().
-	  This results in a large slowdown, but helps to find certain types
-	  of memory corruptions.
-
-config DEBUG_RODATA
-	bool "Write protect kernel read-only data structures"
-	depends on DEBUG_KERNEL
-	help
-	  Mark the kernel read-only data as write-protected in the pagetables,
-	  in order to catch accidental (and incorrect) writes to such const
-	  data. This option may have a slight performance impact because a
-	  portion of the kernel code won't be covered by a 2MB TLB anymore.
-	  If in doubt, say "N".
-
-config 4KSTACKS
-	bool "Use 4Kb for kernel stacks instead of 8Kb"
-	depends on DEBUG_KERNEL
-	help
-	  If you say Y here the kernel will use a 4Kb stacksize for the
-	  kernel stack attached to each process/thread. This facilitates
-	  running more threads on a system and also reduces the pressure
-	  on the VM subsystem for higher order allocations. This option
-	  will also use IRQ stacks to compensate for the reduced stackspace.
-
-config X86_FIND_SMP_CONFIG
-	bool
-	depends on X86_LOCAL_APIC || X86_VOYAGER
-	default y
-
-config X86_MPPARSE
-	bool
-	depends on X86_LOCAL_APIC && !X86_VISWS
-	default y
-
-config DOUBLEFAULT
-	default y
-	bool "Enable doublefault exception handler" if EMBEDDED
-	help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k and might cause you much additional grey
-          hair.
-
-endmenu
--- /dev/null
+++ linux-2.6.24-rc1/arch/x86/Kconfig.debug
@@ -0,0 +1,119 @@
+menu "Kernel hacking"
+
+config TRACE_IRQFLAGS_SUPPORT
+	def_bool y
+
+source "lib/Kconfig.debug"
+
+config EARLY_PRINTK
+	bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+	default y
+	depends on X86_32
+	help
+	  Write kernel log output directly into the VGA buffer or to a serial
+	  port.
+
+	  This is useful for kernel debugging when your machine crashes very
+	  early before the console code is initialized. For normal operation
+	  it is not recommended because it looks ugly and doesn't cooperate
+	  with klogd/syslogd or the X server. You should normally N here,
+	  unless you want to debug such a crash.
+
+config DEBUG_STACKOVERFLOW
+	bool "Check for stack overflows"
+	depends on DEBUG_KERNEL
+	help
+	  This option will cause messages to be printed if free stack space
+	  drops below a certain limit.
+
+config DEBUG_STACK_USAGE
+	bool "Stack utilization instrumentation"
+	depends on DEBUG_KERNEL
+	help
+	  Enables the display of the minimum amount of free stack which each
+	  task has ever had available in the sysrq-T and sysrq-P debug output.
+
+	  This option will slow down process creation somewhat.
+
+comment "Page alloc debug is incompatible with Software Suspend on i386"
+	depends on DEBUG_KERNEL && HIBERNATION
+	depends on X86_32
+
+config DEBUG_PAGEALLOC
+	bool "Debug page memory allocations"
+	depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS
+	depends on X86_32
+	help
+	  Unmap pages from the kernel linear mapping after free_pages().
+	  This results in a large slowdown, but helps to find certain types
+	  of memory corruptions.
+
+config DEBUG_RODATA
+	bool "Write protect kernel read-only data structures"
+	depends on DEBUG_KERNEL
+	help
+	  Mark the kernel read-only data as write-protected in the pagetables,
+	  in order to catch accidental (and incorrect) writes to such const
+	  data. This option may have a slight performance impact because a
+	  portion of the kernel code won't be covered by a 2MB TLB anymore.
+	  If in doubt, say "N".
+
+config 4KSTACKS
+	bool "Use 4Kb for kernel stacks instead of 8Kb"
+	depends on DEBUG_KERNEL
+	depends on X86_32
+	help
+	  If you say Y here the kernel will use a 4Kb stacksize for the
+	  kernel stack attached to each process/thread. This facilitates
+	  running more threads on a system and also reduces the pressure
+	  on the VM subsystem for higher order allocations. This option
+	  will also use IRQ stacks to compensate for the reduced stackspace.
+
+config X86_FIND_SMP_CONFIG
+	def_bool y
+	depends on X86_LOCAL_APIC || X86_VOYAGER
+	depends on X86_32
+
+config X86_MPPARSE
+	def_bool y
+	depends on X86_LOCAL_APIC && !X86_VISWS
+	depends on X86_32
+
+config DOUBLEFAULT
+	default y
+	bool "Enable doublefault exception handler" if EMBEDDED
+	depends on X86_32
+	help
+	  This option allows trapping of rare doublefault exceptions that
+	  would otherwise cause a system to silently reboot. Disabling this
+	  option saves about 4k and might cause you much additional grey
+	  hair.
+
+config IOMMU_DEBUG
+	bool "Enable IOMMU debugging"
+	depends on IOMMU && DEBUG_KERNEL
+	depends on X86_64
+	help
+	  Force the IOMMU to on even when you have less than 4GB of
+	  memory and add debugging code. On overflow always panic. And
+	  allow to enable IOMMU leak tracing. Can be disabled at boot
+	  time with iommu=noforce. This will also enable scatter gather
+	  list merging.  Currently not recommended for production
+	  code. When you use it make sure you have a big enough
+	  IOMMU/AGP aperture.  Most of the options enabled by this can
+	  be set more finegrained using the iommu= command line
+	  options. See Documentation/x86_64/boot-options.txt for more
+	  details.
+
+config IOMMU_LEAK
+	bool "IOMMU leak tracing"
+	depends on DEBUG_KERNEL
+	depends on IOMMU_DEBUG
+	help
+	  Add a simple leak tracer to the IOMMU code. This is useful when you
+	  are debugging a buggy device driver that leaks IOMMU mappings.
+
+#config X86_REMOTE_DEBUG
+#	bool "kgdb debugging stub"
+
+endmenu
--- linux-2.6.24-rc1.orig/arch/x86_64/Kconfig.debug
+++ /dev/null
@@ -1,61 +0,0 @@
-menu "Kernel hacking"
-
-config TRACE_IRQFLAGS_SUPPORT
-	bool
-	default y
-
-source "lib/Kconfig.debug"
-
-config DEBUG_RODATA
-       bool "Write protect kernel read-only data structures"
-       depends on DEBUG_KERNEL
-       help
-	 Mark the kernel read-only data as write-protected in the pagetables,
-	 in order to catch accidental (and incorrect) writes to such const data.
-	 This option may have a slight performance impact because a portion
-	 of the kernel code won't be covered by a 2MB TLB anymore.
-	 If in doubt, say "N".
-
-config IOMMU_DEBUG
-       depends on IOMMU && DEBUG_KERNEL
-       bool "Enable IOMMU debugging"
-       help
-         Force the IOMMU to on even when you have less than 4GB of
-	 memory and add debugging code. On overflow always panic. And
-	 allow to enable IOMMU leak tracing. Can be disabled at boot
-	 time with iommu=noforce. This will also enable scatter gather
-	 list merging.  Currently not recommended for production
-	 code. When you use it make sure you have a big enough
-	 IOMMU/AGP aperture.  Most of the options enabled by this can
-	 be set more finegrained using the iommu= command line
-	 options. See Documentation/x86_64/boot-options.txt for more
-	 details.
-
-config IOMMU_LEAK
-       bool "IOMMU leak tracing"
-       depends on DEBUG_KERNEL
-       depends on IOMMU_DEBUG
-       help
-         Add a simple leak tracer to the IOMMU code. This is useful when you
-	 are debugging a buggy device driver that leaks IOMMU mappings.
-
-config DEBUG_STACKOVERFLOW
-        bool "Check for stack overflows"
-        depends on DEBUG_KERNEL
-        help
-	  This option will cause messages to be printed if free stack space
-	  drops below a certain limit.
-
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-	  Enables the display of the minimum amount of free stack which each
-	  task has ever had available in the sysrq-T and sysrq-P debug output.
-
-	  This option will slow down process creation somewhat.
-
-#config X86_REMOTE_DEBUG
-#       bool "kgdb debugging stub"
-
-endmenu
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Linux v2.6.24-rc1, Linus Torvalds, (Wed Oct 24, 12:19 am)
Re: Linux v2.6.24-rc1, , (Thu Oct 25, 8:45 am)
2.6.24-rc1 doesn't build..., Theodore Tso, (Thu Oct 25, 1:18 am)
Re: 2.6.24-rc1 doesn't build..., Kamalesh Babulal, (Thu Oct 25, 1:30 am)
[patch] portman2x4.c: fix boot hang, Ingo Molnar, (Wed Oct 24, 3:44 pm)
Re: [patch] portman2x4.c: fix boot hang, Takashi Iwai, (Thu Oct 25, 4:16 am)
Re: [patch] portman2x4.c: fix boot hang, Frans Pop, (Wed Oct 24, 4:12 pm)
Re: [patch] portman2x4.c: fix boot hang, Ingo Molnar, (Wed Oct 24, 5:29 pm)
Re: Linux v2.6.24-rc1, Giacomo Catenazzi, (Wed Oct 24, 2:19 pm)
Re: [Bug 9246] On 2.6.24-rc1-gc9927c2b BUG: unable to handle..., Giacomo A. Catenazzi, (Tue Dec 4, 12:47 pm)
Re: [Bug 9246] On 2.6.24-rc1-gc9927c2b BUG: unable to handle..., Giacomo A. Catenazzi, (Wed Dec 5, 5:26 am)
2.6.24-rc1 fails with lockup and BUG:, Romano Giannetti, (Wed Oct 24, 9:25 am)
Re: 2.6.24-rc1 fails with lockup and BUG:, Joseph Fannin, (Wed Oct 24, 12:44 pm)
Re: 2.6.24-rc1 fails with lockup and BUG:, Romano Giannetti, (Fri Oct 26, 1:59 am)
Re: 2.6.24-rc1 fails with lockup and BUG:, Ingo Molnar, (Wed Oct 24, 10:27 am)
Re: 2.6.24-rc1 fails with lockup and BUG:, Romano Giannetti, (Wed Oct 24, 11:53 am)
Re: 2.6.24-rc1 fails with lockup and BUG:, Ingo Molnar, (Wed Oct 24, 11:55 am)
Re: 2.6.24-rc1 fails with lockup and BUG:, Peter Zijlstra, (Wed Oct 24, 12:11 pm)
Re: 2.6.24-rc1 fails with lockup and BUG:, Romano Giannetti, (Fri Oct 26, 1:57 am)
Re: 2.6.24-rc1 fails with lockup - /sbin/ifconfig / inet_ioc..., Stephen Hemminger, (Fri Oct 26, 12:48 pm)
[PATCH] r8169: don't call napi_disable if not doing NAPI, Stephen Hemminger, (Fri Oct 26, 2:33 pm)
Re: [PATCH] r8169: don't call napi_disable if not doing NAPI, Romano Giannetti, (Mon Oct 29, 4:56 am)
Re: [PATCH] r8169: don't call napi_disable if not doing NAPI, Romano Giannetti, (Sun Oct 28, 6:18 pm)
Re: [PATCH] r8169: don't call napi_disable if not doing NAPI, Francois Romieu, (Fri Oct 26, 4:17 pm)
[git pull] x86 arch updates, Ingo Molnar, (Wed Oct 24, 7:30 am)
Re: [git pull] x86 arch updates, Jeff Garzik, (Wed Oct 24, 7:48 am)
Re: [git pull] x86 arch updates, Ingo Molnar, (Wed Oct 24, 8:03 am)
Re: Linux v2.6.24-rc1, Christoph Hellwig, (Wed Oct 24, 4:04 am)
Re: Linux v2.6.24-rc1, Sam Ravnborg, (Wed Oct 24, 7:07 am)
Re: Linux v2.6.24-rc1, Ingo Molnar, (Wed Oct 24, 8:12 am)
Re: [RFC - GIT pull] first step to get rid of x86_64 and i38..., Randy Dunlap, (Wed Oct 24, 6:50 pm)
Re: Linux v2.6.24-rc1, Sam Ravnborg, (Wed Oct 24, 8:21 am)
Re: Linux v2.6.24-rc1, Ingo Molnar, (Wed Oct 24, 4:04 am)
Re: Linux v2.6.24-rc1, Dave Young, (Wed Oct 24, 1:22 am)
Re: Linux v2.6.24-rc1, Ingo Molnar, (Wed Oct 24, 3:23 am)
Re: Linux v2.6.24-rc1, Jens Axboe, (Wed Oct 24, 4:12 am)
Re: Linux v2.6.24-rc1, Dave Young, (Wed Oct 24, 3:33 am)
Re: Linux v2.6.24-rc1, Ohad Ben-Cohen, (Wed Oct 24, 3:32 am)
Re: Linux v2.6.24-rc1, Willy Tarreau, (Wed Oct 24, 12:49 am)