Skip to contentSkip to conversation

kconfig.debug menu dependencies

PATCH In review Randy Dunlap 2 participants 4 messages Oct 27, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 kconfig.debug menu dependencies

From: Randy Dunlap <[email protected]>

DEBUG_FS, HEADERS_CHECK, and UNWIND don't depend on DEBUG_KERNEL but they were stuck into the middle of the DEBUG_KERNEL menu, so move them up above it (since it continues wherever lib/Kconfig.debug was sourced into, hence below it won't work).

Also make LKDTM depend on DEBUG_KERNEL, as other test modules do (e.g., RT MUTEX TESTER, RCU TORTURE TEST).

---
 lib/Kconfig.debug |   87 +++++++++++++++++++++++++++---------------------------
 1 files changed, 44 insertions(+), 43 deletions(-)
lib/Kconfig.debug +44 -43
@@ -47,6 +47,48 @@ config UNUSED_SYMBOLS
 	  you really need it, and what the merge plan to the mainline kernel for
 	  your module is.
 
+config DEBUG_FS
+	bool "Debug Filesystem"
+	depends on SYSFS
+	help
+	  debugfs is a virtual file system that kernel developers use to put
+	  debugging files into.  Enable this option to be able to read and
+	  write to these files.
+
+	  If unsure, say N.
+
+config HEADERS_CHECK
+	bool "Run 'make headers_check' when building vmlinux"
+	depends on !UML
+	help
+	  This option will extract the user-visible kernel headers whenever
+	  building the kernel, and will run basic sanity checks on them to
+	  ensure that exported files do not attempt to include files which
+	  were not exported, etc.
+
+	  If you're making modifications to header files which are
+	  relevant for userspace, say 'Y', and check the headers
+	  exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
+	  your build tree), to make sure they're suitable.
+
+config UNWIND_INFO
+	bool "Compile the kernel with frame unwind information"
+	depends on !IA64 && !PARISC
+	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
+	help
+	  If you say Y here the resulting kernel image will be slightly larger
+	  but not slower, and it will give very useful debugging information.
+	  If you don't debug the kernel, you can say N, but we may not be able
+	  to solve problems without frame unwind information or frame pointers.
+
+config STACK_UNWIND
+	bool "Stack unwind support"
+	depends on UNWIND_INFO
+	depends on X86
+	help
+	  This enables more precise stack traces, omitting all unrelated
+	  occurrences of pointers into kernel code from the dump.
+
 config DEBUG_KERNEL
 	bool "Kernel debugging"
 	help
@@ -302,16 +344,6 @@ config DEBUG_INFO
 
 	  If unsure, say N.
 
-config DEBUG_FS
-	bool "Debug Filesystem"
-	depends on SYSFS
-	help
-	  debugfs is a virtual file system that kernel developers use to put
-	  debugging files into.  Enable this option to be able to read and
-	  write to these files.
-
-	  If unsure, say N.
-
 config DEBUG_VM
 	bool "Debug VM"
 	depends on DEBUG_KERNEL
@@ -340,24 +372,6 @@ config FRAME_POINTER
 	  some architectures or if you use external debuggers.
 	  If you don't debug the kernel, you can say N.
 
-config UNWIND_INFO
-	bool "Compile the kernel with frame unwind information"
-	depends on !IA64 && !PARISC
-	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
-	help
-	  If you say Y here the resulting kernel image will be slightly larger
-	  but not slower, and it will give very useful debugging information.
-	  If you don't debug the kernel, you can say N, but we may not be able
-	  to solve problems without frame unwind information or frame pointers.
-
-config STACK_UNWIND
-	bool "Stack unwind support"
-	depends on UNWIND_INFO
-	depends on X86
-	help
-	  This enables more precise stack traces, omitting all unrelated
-	  occurrences of pointers into kernel code from the dump.
-
 config FORCED_INLINING
 	bool "Force gcc to inline functions marked 'inline'"
 	depends on DEBUG_KERNEL
@@ -372,20 +386,6 @@ config FORCED_INLINING
 	  become the default in the future, until then this option is there to
 	  test gcc for this.
 
-config HEADERS_CHECK
-	bool "Run 'make headers_check' when building vmlinux"
-	depends on !UML
-	help
-	  This option will extract the user-visible kernel headers whenever
-	  building the kernel, and will run basic sanity checks on them to
-	  ensure that exported files do not attempt to include files which
-	  were not exported, etc.
-
-	  If you're making modifications to header files which are
-	  relevant for userspace, say 'Y', and check the headers
-	  exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
-	  your build tree), to make sure they're suitable.
-
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL
@@ -402,7 +402,7 @@ config RCU_TORTURE_TEST
 
 config LKDTM
 	tristate "Linux Kernel Dump Test Tool Module"
-	depends on KPROBES
+	depends on DEBUG_KERNEL && KPROBES
 	default n
 	help
 	This module enables testing of the different dumping mechanisms by
@@ -413,3 +413,4 @@ config LKDTM
 
 	Documentation on how to use the module can be found in
 	drivers/misc/lkdtm.c
+

---

#1 lore raw
Quoted 7 lines · On Fri, 27 Oct 2006 12:08:37 -0700 Randy Dunlap <[email protected]> wrote:

DEBUG_FS, HEADERS_CHECK, and UNWIND don't depend on DEBUG_KERNEL but they were stuck into the middle of the DEBUG_KERNEL menu, so move them up above it (since it continues wherever lib/Kconfig.debug was sourced into, hence below it won't work).

Also make LKDTM depend on DEBUG_KERNEL, as other test modules do (e.g., RT MUTEX TESTER, RCU TORTURE TEST).

This conflicts fairly seriously with the below.

From: Don Mullis <[email protected]>

Refactor Kconfig content to maximize nesting of menus by menuconfig and xconfig.

Tested by simultaneously running make xconfig with and without patch, and comparing displays.

---

 drivers/parport/Kconfig     |    6 +-
 drivers/pci/hotplug/Kconfig |    3 -
 drivers/serial/Kconfig      |   53 ++++++++++-----------
 lib/Kconfig.debug           |   85 +++++++++++++++++-----------------
 4 files changed, 74 insertions(+), 73 deletions(-)
drivers/parport/Kconfig renamed from drivers/parport/Kconfig~kconfig-refactoring-for-better-menu-nesting +3 -3
diff -puN drivers/parport/Kconfig~kconfig-refactoring-for-better-menu-nesting drivers/parport/Kconfig
@@ -82,9 +82,6 @@ config PARPORT_PC_PCMCIA
 	  Say Y here if you need PCMCIA support for your PC-style parallel
 	  ports. If unsure, say N.
 
-config PARPORT_NOT_PC
-	bool
-
 config PARPORT_IP32
 	tristate "SGI IP32 builtin port (EXPERIMENTAL)"
 	depends on SGI_IP32 && PARPORT && EXPERIMENTAL
@@ -158,5 +155,8 @@ config PARPORT_1284
 	  transfer modes. Also say Y if you want device ID information to
 	  appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
 
+config PARPORT_NOT_PC
+	bool
+
 endmenu
 
drivers/pci/hotplug/Kconfig renamed from drivers/pci/hotplug/Kconfig~kconfig-refactoring-for-better-menu-nesting +2 -1
diff -puN drivers/pci/hotplug/Kconfig~kconfig-refactoring-for-better-menu-nesting drivers/pci/hotplug/Kconfig
@@ -76,7 +76,8 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)
+	depends on HOTPLUG_PCI
+	depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK)
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
 	  ACPI.
drivers/serial/Kconfig renamed from drivers/serial/Kconfig~kconfig-refactoring-for-better-menu-nesting +26 -27

71 lines not on this page · raw message

lib/Kconfig.debug renamed from lib/Kconfig.debug~kconfig-refactoring-for-better-menu-nesting +43 -42

115 lines not on this page · raw message

_

#2 lore raw
Quoted 11 lines · Andrew Morton
Quoted 7 lines · On Fri, 27 Oct 2006 12:08:37 -0700 Randy Dunlap <[email protected]> wrote:

DEBUG_FS, HEADERS_CHECK, and UNWIND don't depend on DEBUG_KERNEL but they were stuck into the middle of the DEBUG_KERNEL menu, so move them up above it (since it continues wherever lib/Kconfig.debug was sourced into, hence below it won't work).

Also make LKDTM depend on DEBUG_KERNEL, as other test modules do (e.g., RT MUTEX TESTER, RCU TORTURE TEST).

Quoted 6 lines

This conflicts fairly seriously with the below.

From: Don Mullis <[email protected]>

Refactor Kconfig content to maximize nesting of menus by menuconfig and xconfig.

OK, I'll reconcile them.

Signature · 1 line
~Randy
#3 lore raw
In reply to Andrew Morton
Quoted 8 lines · Andrew Morton
Quoted 5 lines · On Fri, 27 Oct 2006 12:08:37 -0700 Randy Dunlap <[email protected]> wrote:

DEBUG_FS, HEADERS_CHECK, and UNWIND don't depend on DEBUG_KERNEL but they were stuck into the middle of the DEBUG_KERNEL menu, so move them up above it (since it continues wherever lib/Kconfig.debug was sourced into, hence below it won't work).

Quoted 4 lines
Quoted 2 lines

Also make LKDTM depend on DEBUG_KERNEL, as other test modules do (e.g., RT MUTEX TESTER, RCU TORTURE TEST).

This conflicts fairly seriously with the below.

actually they are basically equivalent, so no worries.

Signature · 1 line
~Randy