aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-10-16 01:01:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:31 -0400
commit9ba16087d9f996a93ab6f4453a52a4b24bc1f25c (patch)
tree98a292c556b646aec40ce137b1ec689b3469f120
parenta25d644fc0e232f242d1f3baa63c149c42536ff0 (diff)
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>
-rw-r--r--arch/Kconfig18
-rw-r--r--arch/ia64/Kconfig8
-rw-r--r--arch/x86/Kconfig23
-rw-r--r--drivers/ide/Kconfig2
-rw-r--r--kernel/time/Kconfig1
-rw-r--r--lib/Kconfig4
-rw-r--r--mm/Kconfig4
7 files changed, 19 insertions, 41 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 0267babe5eb..e6ab550bceb 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -28,7 +28,7 @@ config OPROFILE_IBS
28 If unsure, say N. 28 If unsure, say N.
29 29
30config HAVE_OPROFILE 30config HAVE_OPROFILE
31 def_bool n 31 bool
32 32
33config KPROBES 33config KPROBES
34 bool "Kprobes" 34 bool "Kprobes"
@@ -42,7 +42,7 @@ config KPROBES
42 If in doubt, say "N". 42 If in doubt, say "N".
43 43
44config HAVE_EFFICIENT_UNALIGNED_ACCESS 44config HAVE_EFFICIENT_UNALIGNED_ACCESS
45 def_bool n 45 bool
46 help 46 help
47 Some architectures are unable to perform unaligned accesses 47 Some architectures are unable to perform unaligned accesses
48 without the use of get_unaligned/put_unaligned. Others are 48 without the use of get_unaligned/put_unaligned. Others are
@@ -65,13 +65,13 @@ config KRETPROBES
65 depends on KPROBES && HAVE_KRETPROBES 65 depends on KPROBES && HAVE_KRETPROBES
66 66
67config HAVE_IOREMAP_PROT 67config HAVE_IOREMAP_PROT
68 def_bool n 68 bool
69 69
70config HAVE_KPROBES 70config HAVE_KPROBES
71 def_bool n 71 bool
72 72
73config HAVE_KRETPROBES 73config HAVE_KRETPROBES
74 def_bool n 74 bool
75 75
76# 76#
77# An arch should select this if it provides all these things: 77# An arch should select this if it provides all these things:
@@ -89,16 +89,16 @@ config HAVE_KRETPROBES
89# signal delivery calls tracehook_signal_handler() 89# signal delivery calls tracehook_signal_handler()
90# 90#
91config HAVE_ARCH_TRACEHOOK 91config HAVE_ARCH_TRACEHOOK
92 def_bool n 92 bool
93 93
94config HAVE_DMA_ATTRS 94config HAVE_DMA_ATTRS
95 def_bool n 95 bool
96 96
97config USE_GENERIC_SMP_HELPERS 97config USE_GENERIC_SMP_HELPERS
98 def_bool n 98 bool
99 99
100config HAVE_CLK 100config HAVE_CLK
101 def_bool n 101 bool
102 help 102 help
103 The <linux/clk.h> calls support software clock gating and 103 The <linux/clk.h> calls support software clock gating and
104 thus are a key power management tool on many systems. 104 thus are a key power management tool on many systems.
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 48e496fe1e7..3b7aa38254a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,14 +60,6 @@ config RWSEM_XCHGADD_ALGORITHM
60 bool 60 bool
61 default y 61 default y
62 62
63config ARCH_HAS_ILOG2_U32
64 bool
65 default n
66
67config ARCH_HAS_ILOG2_U64
68 bool
69 default n
70
71config HUGETLB_PAGE_SIZE_VARIABLE 63config HUGETLB_PAGE_SIZE_VARIABLE
72 bool 64 bool
73 depends on HUGETLB_PAGE 65 depends on HUGETLB_PAGE
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f65c2744d57..7ccb6e60e60 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -39,10 +39,6 @@ config ARCH_DEFCONFIG
39 default "arch/x86/configs/i386_defconfig" if X86_32 39 default "arch/x86/configs/i386_defconfig" if X86_32
40 default "arch/x86/configs/x86_64_defconfig" if X86_64 40 default "arch/x86/configs/x86_64_defconfig" if X86_64
41 41
42
43config GENERIC_LOCKBREAK
44 def_bool n
45
46config GENERIC_TIME 42config GENERIC_TIME
47 def_bool y 43 def_bool y
48 44
@@ -95,7 +91,7 @@ config GENERIC_HWEIGHT
95 def_bool y 91 def_bool y
96 92
97config GENERIC_GPIO 93config GENERIC_GPIO
98 def_bool n 94 bool
99 95
100config ARCH_MAY_HAVE_PC_FDC 96config ARCH_MAY_HAVE_PC_FDC
101 def_bool y 97 def_bool y
@@ -106,12 +102,6 @@ config RWSEM_GENERIC_SPINLOCK
106config RWSEM_XCHGADD_ALGORITHM 102config RWSEM_XCHGADD_ALGORITHM
107 def_bool X86_XADD 103 def_bool X86_XADD
108 104
109config ARCH_HAS_ILOG2_U32
110 def_bool n
111
112config ARCH_HAS_ILOG2_U64
113 def_bool n
114
115config ARCH_HAS_CPU_IDLE_WAIT 105config ARCH_HAS_CPU_IDLE_WAIT
116 def_bool y 106 def_bool y
117 107
@@ -758,9 +748,8 @@ config I8K
758 Say N otherwise. 748 Say N otherwise.
759 749
760config X86_REBOOTFIXUPS 750config X86_REBOOTFIXUPS
761 def_bool n 751 bool "Enable X86 board specific fixups for reboot"
762 prompt "Enable X86 board specific fixups for reboot" 752 depends on X86_32
763 depends on X86_32 && X86
764 ---help--- 753 ---help---
765 This enables chipset and/or board specific fixups to be done 754 This enables chipset and/or board specific fixups to be done
766 in order to get reboot to work correctly. This is only needed on 755 in order to get reboot to work correctly. This is only needed on
@@ -944,8 +933,7 @@ config HIGHMEM
944 depends on X86_32 && (HIGHMEM64G || HIGHMEM4G) 933 depends on X86_32 && (HIGHMEM64G || HIGHMEM4G)
945 934
946config X86_PAE 935config X86_PAE
947 def_bool n 936 bool "PAE (Physical Address Extension) Support"
948 prompt "PAE (Physical Address Extension) Support"
949 depends on X86_32 && !HIGHMEM4G 937 depends on X86_32 && !HIGHMEM4G
950 select RESOURCES_64BIT 938 select RESOURCES_64BIT
951 help 939 help
@@ -1238,8 +1226,7 @@ config X86_PAT
1238 If unsure, say Y. 1226 If unsure, say Y.
1239 1227
1240config EFI 1228config EFI
1241 def_bool n 1229 bool "EFI runtime service support"
1242 prompt "EFI runtime service support"
1243 depends on ACPI 1230 depends on ACPI
1244 ---help--- 1231 ---help---
1245 This enables the kernel to use EFI runtime services that are 1232 This enables the kernel to use EFI runtime services that are
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6c6dd2faced..74a369a6116 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,7 +4,7 @@
4 4
5# Select HAVE_IDE if IDE is supported 5# Select HAVE_IDE if IDE is supported
6config HAVE_IDE 6config HAVE_IDE
7 def_bool n 7 bool
8 8
9menuconfig IDE 9menuconfig IDE
10 tristate "ATA/ATAPI/MFM/RLL support" 10 tristate "ATA/ATAPI/MFM/RLL support"
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 8d53106a0a9..95ed42951e0 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -3,7 +3,6 @@
3# 3#
4config TICK_ONESHOT 4config TICK_ONESHOT
5 bool 5 bool
6 default n
7 6
8config NO_HZ 7config NO_HZ
9 bool "Tickless System (Dynamic Ticks)" 8 bool "Tickless System (Dynamic Ticks)"
diff --git a/lib/Kconfig b/lib/Kconfig
index c7ad7a5b353..85cf7ea978a 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -8,10 +8,10 @@ config BITREVERSE
8 tristate 8 tristate
9 9
10config GENERIC_FIND_FIRST_BIT 10config GENERIC_FIND_FIRST_BIT
11 def_bool n 11 bool
12 12
13config GENERIC_FIND_NEXT_BIT 13config GENERIC_FIND_NEXT_BIT
14 def_bool n 14 bool
15 15
16config CRC_CCITT 16config CRC_CCITT
17 tristate "CRC-CCITT functions" 17 tristate "CRC-CCITT functions"
diff --git a/mm/Kconfig b/mm/Kconfig
index 0bd9c2dbb2a..5585f129359 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -101,7 +101,7 @@ config HAVE_MEMORY_PRESENT
101# with gcc 3.4 and later. 101# with gcc 3.4 and later.
102# 102#
103config SPARSEMEM_STATIC 103config SPARSEMEM_STATIC
104 def_bool n 104 bool
105 105
106# 106#
107# Architecture platforms which require a two level mem_section in SPARSEMEM 107# Architecture platforms which require a two level mem_section in SPARSEMEM
@@ -113,7 +113,7 @@ config SPARSEMEM_EXTREME
113 depends on SPARSEMEM && !SPARSEMEM_STATIC 113 depends on SPARSEMEM && !SPARSEMEM_STATIC
114 114
115config SPARSEMEM_VMEMMAP_ENABLE 115config SPARSEMEM_VMEMMAP_ENABLE
116 def_bool n 116 bool
117 117
118config SPARSEMEM_VMEMMAP 118config SPARSEMEM_VMEMMAP
119 bool "Sparse Memory virtual memmap" 119 bool "Sparse Memory virtual memmap"