Browse Source

Kconfig: eliminate "def_bool n" constructs

Using "def_bool n" is pointless, simply using bool here appears more
appropriate.

Further, retaining such options that don't have a prompt and aren't
selected by anything seems also at least questionable.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jan Beulich 16 years ago
parent
commit
9ba16087d9
7 changed files with 19 additions and 41 deletions
  1. 9 9
      arch/Kconfig
  2. 0 8
      arch/ia64/Kconfig
  3. 5 18
      arch/x86/Kconfig
  4. 1 1
      drivers/ide/Kconfig
  5. 0 1
      kernel/time/Kconfig
  6. 2 2
      lib/Kconfig
  7. 2 2
      mm/Kconfig

+ 9 - 9
arch/Kconfig

@@ -28,7 +28,7 @@ config OPROFILE_IBS
 	  If unsure, say N.
 	  If unsure, say N.
 
 
 config HAVE_OPROFILE
 config HAVE_OPROFILE
-	def_bool n
+	bool
 
 
 config KPROBES
 config KPROBES
 	bool "Kprobes"
 	bool "Kprobes"
@@ -42,7 +42,7 @@ config KPROBES
 	  If in doubt, say "N".
 	  If in doubt, say "N".
 
 
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
-	def_bool n
+	bool
 	help
 	help
 	  Some architectures are unable to perform unaligned accesses
 	  Some architectures are unable to perform unaligned accesses
 	  without the use of get_unaligned/put_unaligned. Others are
 	  without the use of get_unaligned/put_unaligned. Others are
@@ -65,13 +65,13 @@ config KRETPROBES
 	depends on KPROBES && HAVE_KRETPROBES
 	depends on KPROBES && HAVE_KRETPROBES
 
 
 config HAVE_IOREMAP_PROT
 config HAVE_IOREMAP_PROT
-	def_bool n
+	bool
 
 
 config HAVE_KPROBES
 config HAVE_KPROBES
-	def_bool n
+	bool
 
 
 config HAVE_KRETPROBES
 config HAVE_KRETPROBES
-	def_bool n
+	bool
 
 
 #
 #
 # An arch should select this if it provides all these things:
 # An arch should select this if it provides all these things:
@@ -89,16 +89,16 @@ config HAVE_KRETPROBES
 #	signal delivery		calls tracehook_signal_handler()
 #	signal delivery		calls tracehook_signal_handler()
 #
 #
 config HAVE_ARCH_TRACEHOOK
 config HAVE_ARCH_TRACEHOOK
-	def_bool n
+	bool
 
 
 config HAVE_DMA_ATTRS
 config HAVE_DMA_ATTRS
-	def_bool n
+	bool
 
 
 config USE_GENERIC_SMP_HELPERS
 config USE_GENERIC_SMP_HELPERS
-	def_bool n
+	bool
 
 
 config HAVE_CLK
 config HAVE_CLK
-	def_bool n
+	bool
 	help
 	help
 	  The <linux/clk.h> calls support software clock gating and
 	  The <linux/clk.h> calls support software clock gating and
 	  thus are a key power management tool on many systems.
 	  thus are a key power management tool on many systems.

+ 0 - 8
arch/ia64/Kconfig

@@ -60,14 +60,6 @@ config RWSEM_XCHGADD_ALGORITHM
 	bool
 	bool
 	default y
 	default y
 
 
-config ARCH_HAS_ILOG2_U32
-	bool
-	default n
-
-config ARCH_HAS_ILOG2_U64
-	bool
-	default n
-
 config HUGETLB_PAGE_SIZE_VARIABLE
 config HUGETLB_PAGE_SIZE_VARIABLE
 	bool
 	bool
 	depends on HUGETLB_PAGE
 	depends on HUGETLB_PAGE

+ 5 - 18
arch/x86/Kconfig

@@ -39,10 +39,6 @@ config ARCH_DEFCONFIG
 	default "arch/x86/configs/i386_defconfig" if X86_32
 	default "arch/x86/configs/i386_defconfig" if X86_32
 	default "arch/x86/configs/x86_64_defconfig" if X86_64
 	default "arch/x86/configs/x86_64_defconfig" if X86_64
 
 
-
-config GENERIC_LOCKBREAK
-	def_bool n
-
 config GENERIC_TIME
 config GENERIC_TIME
 	def_bool y
 	def_bool y
 
 
@@ -95,7 +91,7 @@ config GENERIC_HWEIGHT
 	def_bool y
 	def_bool y
 
 
 config GENERIC_GPIO
 config GENERIC_GPIO
-	def_bool n
+	bool
 
 
 config ARCH_MAY_HAVE_PC_FDC
 config ARCH_MAY_HAVE_PC_FDC
 	def_bool y
 	def_bool y
@@ -106,12 +102,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
 config RWSEM_XCHGADD_ALGORITHM
 	def_bool X86_XADD
 	def_bool X86_XADD
 
 
-config ARCH_HAS_ILOG2_U32
-	def_bool n
-
-config ARCH_HAS_ILOG2_U64
-	def_bool n
-
 config ARCH_HAS_CPU_IDLE_WAIT
 config ARCH_HAS_CPU_IDLE_WAIT
 	def_bool y
 	def_bool y
 
 
@@ -758,9 +748,8 @@ config I8K
 	  Say N otherwise.
 	  Say N otherwise.
 
 
 config X86_REBOOTFIXUPS
 config X86_REBOOTFIXUPS
-	def_bool n
-	prompt "Enable X86 board specific fixups for reboot"
-	depends on X86_32 && X86
+	bool "Enable X86 board specific fixups for reboot"
+	depends on X86_32
 	---help---
 	---help---
 	  This enables chipset and/or board specific fixups to be done
 	  This enables chipset and/or board specific fixups to be done
 	  in order to get reboot to work correctly. This is only needed on
 	  in order to get reboot to work correctly. This is only needed on
@@ -944,8 +933,7 @@ config HIGHMEM
 	depends on X86_32 && (HIGHMEM64G || HIGHMEM4G)
 	depends on X86_32 && (HIGHMEM64G || HIGHMEM4G)
 
 
 config X86_PAE
 config X86_PAE
-	def_bool n
-	prompt "PAE (Physical Address Extension) Support"
+	bool "PAE (Physical Address Extension) Support"
 	depends on X86_32 && !HIGHMEM4G
 	depends on X86_32 && !HIGHMEM4G
 	select RESOURCES_64BIT
 	select RESOURCES_64BIT
 	help
 	help
@@ -1238,8 +1226,7 @@ config X86_PAT
 	  If unsure, say Y.
 	  If unsure, say Y.
 
 
 config EFI
 config EFI
-	def_bool n
-	prompt "EFI runtime service support"
+	bool "EFI runtime service support"
 	depends on ACPI
 	depends on ACPI
 	---help---
 	---help---
 	This enables the kernel to use EFI runtime services that are
 	This enables the kernel to use EFI runtime services that are

+ 1 - 1
drivers/ide/Kconfig

@@ -4,7 +4,7 @@
 
 
 # Select HAVE_IDE if IDE is supported
 # Select HAVE_IDE if IDE is supported
 config HAVE_IDE
 config HAVE_IDE
-	def_bool n
+	bool
 
 
 menuconfig IDE
 menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
 	tristate "ATA/ATAPI/MFM/RLL support"

+ 0 - 1
kernel/time/Kconfig

@@ -3,7 +3,6 @@
 #
 #
 config TICK_ONESHOT
 config TICK_ONESHOT
 	bool
 	bool
-	default n
 
 
 config NO_HZ
 config NO_HZ
 	bool "Tickless System (Dynamic Ticks)"
 	bool "Tickless System (Dynamic Ticks)"

+ 2 - 2
lib/Kconfig

@@ -8,10 +8,10 @@ config BITREVERSE
 	tristate
 	tristate
 
 
 config GENERIC_FIND_FIRST_BIT
 config GENERIC_FIND_FIRST_BIT
-	def_bool n
+	bool
 
 
 config GENERIC_FIND_NEXT_BIT
 config GENERIC_FIND_NEXT_BIT
-	def_bool n
+	bool
 
 
 config CRC_CCITT
 config CRC_CCITT
 	tristate "CRC-CCITT functions"
 	tristate "CRC-CCITT functions"

+ 2 - 2
mm/Kconfig

@@ -101,7 +101,7 @@ config HAVE_MEMORY_PRESENT
 # with gcc 3.4 and later.
 # with gcc 3.4 and later.
 #
 #
 config SPARSEMEM_STATIC
 config SPARSEMEM_STATIC
-	def_bool n
+	bool
 
 
 #
 #
 # Architecture platforms which require a two level mem_section in SPARSEMEM
 # Architecture platforms which require a two level mem_section in SPARSEMEM
@@ -113,7 +113,7 @@ config SPARSEMEM_EXTREME
 	depends on SPARSEMEM && !SPARSEMEM_STATIC
 	depends on SPARSEMEM && !SPARSEMEM_STATIC
 
 
 config SPARSEMEM_VMEMMAP_ENABLE
 config SPARSEMEM_VMEMMAP_ENABLE
-	def_bool n
+	bool
 
 
 config SPARSEMEM_VMEMMAP
 config SPARSEMEM_VMEMMAP
 	bool "Sparse Memory virtual memmap"
 	bool "Sparse Memory virtual memmap"