Commit a1583d3e83cae1c58870602efc6328c34b644c01

Authored by Roman Zippel
Committed by Linus Torvalds
1 parent c87e2837be

[PATCH] fix rt-mutex defaults and dependencies

Fix defaults and dependencies.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 3 deletions Inline Diff

1 1
2 config PRINTK_TIME 2 config PRINTK_TIME
3 bool "Show timing information on printks" 3 bool "Show timing information on printks"
4 help 4 help
5 Selecting this option causes timing information to be 5 Selecting this option causes timing information to be
6 included in printk output. This allows you to measure 6 included in printk output. This allows you to measure
7 the interval between kernel operations, including bootup 7 the interval between kernel operations, including bootup
8 operations. This is useful for identifying long delays 8 operations. This is useful for identifying long delays
9 in kernel startup. 9 in kernel startup.
10 10
11 11
12 config MAGIC_SYSRQ 12 config MAGIC_SYSRQ
13 bool "Magic SysRq key" 13 bool "Magic SysRq key"
14 depends on !UML 14 depends on !UML
15 help 15 help
16 If you say Y here, you will have some control over the system even 16 If you say Y here, you will have some control over the system even
17 if the system crashes for example during kernel debugging (e.g., you 17 if the system crashes for example during kernel debugging (e.g., you
18 will be able to flush the buffer cache to disk, reboot the system 18 will be able to flush the buffer cache to disk, reboot the system
19 immediately or dump some status information). This is accomplished 19 immediately or dump some status information). This is accomplished
20 by pressing various keys while holding SysRq (Alt+PrintScreen). It 20 by pressing various keys while holding SysRq (Alt+PrintScreen). It
21 also works on a serial console (on PC hardware at least), if you 21 also works on a serial console (on PC hardware at least), if you
22 send a BREAK and then within 5 seconds a command keypress. The 22 send a BREAK and then within 5 seconds a command keypress. The
23 keys are documented in <file:Documentation/sysrq.txt>. Don't say Y 23 keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
24 unless you really know what this hack does. 24 unless you really know what this hack does.
25 25
26 config DEBUG_KERNEL 26 config DEBUG_KERNEL
27 bool "Kernel debugging" 27 bool "Kernel debugging"
28 help 28 help
29 Say Y here if you are developing drivers or trying to debug and 29 Say Y here if you are developing drivers or trying to debug and
30 identify kernel problems. 30 identify kernel problems.
31 31
32 config LOG_BUF_SHIFT 32 config LOG_BUF_SHIFT
33 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL 33 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
34 range 12 21 34 range 12 21
35 default 17 if S390 35 default 17 if S390
36 default 16 if X86_NUMAQ || IA64 36 default 16 if X86_NUMAQ || IA64
37 default 15 if SMP 37 default 15 if SMP
38 default 14 38 default 14
39 help 39 help
40 Select kernel log buffer size as a power of 2. 40 Select kernel log buffer size as a power of 2.
41 Defaults and Examples: 41 Defaults and Examples:
42 17 => 128 KB for S/390 42 17 => 128 KB for S/390
43 16 => 64 KB for x86 NUMAQ or IA-64 43 16 => 64 KB for x86 NUMAQ or IA-64
44 15 => 32 KB for SMP 44 15 => 32 KB for SMP
45 14 => 16 KB for uniprocessor 45 14 => 16 KB for uniprocessor
46 13 => 8 KB 46 13 => 8 KB
47 12 => 4 KB 47 12 => 4 KB
48 48
49 config DETECT_SOFTLOCKUP 49 config DETECT_SOFTLOCKUP
50 bool "Detect Soft Lockups" 50 bool "Detect Soft Lockups"
51 depends on DEBUG_KERNEL 51 depends on DEBUG_KERNEL
52 default y 52 default y
53 help 53 help
54 Say Y here to enable the kernel to detect "soft lockups", 54 Say Y here to enable the kernel to detect "soft lockups",
55 which are bugs that cause the kernel to loop in kernel 55 which are bugs that cause the kernel to loop in kernel
56 mode for more than 10 seconds, without giving other tasks a 56 mode for more than 10 seconds, without giving other tasks a
57 chance to run. 57 chance to run.
58 58
59 When a soft-lockup is detected, the kernel will print the 59 When a soft-lockup is detected, the kernel will print the
60 current stack trace (which you should report), but the 60 current stack trace (which you should report), but the
61 system will stay locked up. This feature has negligible 61 system will stay locked up. This feature has negligible
62 overhead. 62 overhead.
63 63
64 (Note that "hard lockups" are separate type of bugs that 64 (Note that "hard lockups" are separate type of bugs that
65 can be detected via the NMI-watchdog, on platforms that 65 can be detected via the NMI-watchdog, on platforms that
66 support it.) 66 support it.)
67 67
68 config SCHEDSTATS 68 config SCHEDSTATS
69 bool "Collect scheduler statistics" 69 bool "Collect scheduler statistics"
70 depends on DEBUG_KERNEL && PROC_FS 70 depends on DEBUG_KERNEL && PROC_FS
71 help 71 help
72 If you say Y here, additional code will be inserted into the 72 If you say Y here, additional code will be inserted into the
73 scheduler and related routines to collect statistics about 73 scheduler and related routines to collect statistics about
74 scheduler behavior and provide them in /proc/schedstat. These 74 scheduler behavior and provide them in /proc/schedstat. These
75 stats may be useful for both tuning and debugging the scheduler 75 stats may be useful for both tuning and debugging the scheduler
76 If you aren't debugging the scheduler or trying to tune a specific 76 If you aren't debugging the scheduler or trying to tune a specific
77 application, you can say N to avoid the very slight overhead 77 application, you can say N to avoid the very slight overhead
78 this adds. 78 this adds.
79 79
80 config DEBUG_SLAB 80 config DEBUG_SLAB
81 bool "Debug slab memory allocations" 81 bool "Debug slab memory allocations"
82 depends on DEBUG_KERNEL && SLAB 82 depends on DEBUG_KERNEL && SLAB
83 help 83 help
84 Say Y here to have the kernel do limited verification on memory 84 Say Y here to have the kernel do limited verification on memory
85 allocation as well as poisoning memory on free to catch use of freed 85 allocation as well as poisoning memory on free to catch use of freed
86 memory. This can make kmalloc/kfree-intensive workloads much slower. 86 memory. This can make kmalloc/kfree-intensive workloads much slower.
87 87
88 config DEBUG_SLAB_LEAK 88 config DEBUG_SLAB_LEAK
89 bool "Memory leak debugging" 89 bool "Memory leak debugging"
90 depends on DEBUG_SLAB 90 depends on DEBUG_SLAB
91 91
92 config DEBUG_PREEMPT 92 config DEBUG_PREEMPT
93 bool "Debug preemptible kernel" 93 bool "Debug preemptible kernel"
94 depends on DEBUG_KERNEL && PREEMPT 94 depends on DEBUG_KERNEL && PREEMPT
95 default y 95 default y
96 help 96 help
97 If you say Y here then the kernel will use a debug variant of the 97 If you say Y here then the kernel will use a debug variant of the
98 commonly used smp_processor_id() function and will print warnings 98 commonly used smp_processor_id() function and will print warnings
99 if kernel code uses it in a preemption-unsafe way. Also, the kernel 99 if kernel code uses it in a preemption-unsafe way. Also, the kernel
100 will detect preemption count underflows. 100 will detect preemption count underflows.
101 101
102 config DEBUG_MUTEXES 102 config DEBUG_MUTEXES
103 bool "Mutex debugging, deadlock detection" 103 bool "Mutex debugging, deadlock detection"
104 default n 104 default n
105 depends on DEBUG_KERNEL 105 depends on DEBUG_KERNEL
106 help 106 help
107 This allows mutex semantics violations and mutex related deadlocks 107 This allows mutex semantics violations and mutex related deadlocks
108 (lockups) to be detected and reported automatically. 108 (lockups) to be detected and reported automatically.
109 109
110 config DEBUG_RT_MUTEXES 110 config DEBUG_RT_MUTEXES
111 bool "RT Mutex debugging, deadlock detection" 111 bool "RT Mutex debugging, deadlock detection"
112 default y
113 depends on DEBUG_KERNEL && RT_MUTEXES 112 depends on DEBUG_KERNEL && RT_MUTEXES
114 help 113 help
115 This allows rt mutex semantics violations and rt mutex related 114 This allows rt mutex semantics violations and rt mutex related
116 deadlocks (lockups) to be detected and reported automatically. 115 deadlocks (lockups) to be detected and reported automatically.
117 116
118 config DEBUG_PI_LIST 117 config DEBUG_PI_LIST
119 bool 118 bool
120 default y 119 default y
121 depends on DEBUG_RT_MUTEXES 120 depends on DEBUG_RT_MUTEXES
122 121
123 config RT_MUTEX_TESTER 122 config RT_MUTEX_TESTER
124 bool "Built-in scriptable tester for rt-mutexes" 123 bool "Built-in scriptable tester for rt-mutexes"
125 depends on RT_MUTEXES 124 depends on DEBUG_KERNEL && RT_MUTEXES
126 default n
127 help 125 help
128 This option enables a rt-mutex tester. 126 This option enables a rt-mutex tester.
129 127
130 config DEBUG_SPINLOCK 128 config DEBUG_SPINLOCK
131 bool "Spinlock debugging" 129 bool "Spinlock debugging"
132 depends on DEBUG_KERNEL 130 depends on DEBUG_KERNEL
133 help 131 help
134 Say Y here and build SMP to catch missing spinlock initialization 132 Say Y here and build SMP to catch missing spinlock initialization
135 and certain other kinds of spinlock errors commonly made. This is 133 and certain other kinds of spinlock errors commonly made. This is
136 best used in conjunction with the NMI watchdog so that spinlock 134 best used in conjunction with the NMI watchdog so that spinlock
137 deadlocks are also debuggable. 135 deadlocks are also debuggable.
138 136
139 config DEBUG_SPINLOCK_SLEEP 137 config DEBUG_SPINLOCK_SLEEP
140 bool "Sleep-inside-spinlock checking" 138 bool "Sleep-inside-spinlock checking"
141 depends on DEBUG_KERNEL 139 depends on DEBUG_KERNEL
142 help 140 help
143 If you say Y here, various routines which may sleep will become very 141 If you say Y here, various routines which may sleep will become very
144 noisy if they are called with a spinlock held. 142 noisy if they are called with a spinlock held.
145 143
146 config DEBUG_KOBJECT 144 config DEBUG_KOBJECT
147 bool "kobject debugging" 145 bool "kobject debugging"
148 depends on DEBUG_KERNEL 146 depends on DEBUG_KERNEL
149 help 147 help
150 If you say Y here, some extra kobject debugging messages will be sent 148 If you say Y here, some extra kobject debugging messages will be sent
151 to the syslog. 149 to the syslog.
152 150
153 config DEBUG_HIGHMEM 151 config DEBUG_HIGHMEM
154 bool "Highmem debugging" 152 bool "Highmem debugging"
155 depends on DEBUG_KERNEL && HIGHMEM 153 depends on DEBUG_KERNEL && HIGHMEM
156 help 154 help
157 This options enables addition error checking for high memory systems. 155 This options enables addition error checking for high memory systems.
158 Disable for production systems. 156 Disable for production systems.
159 157
160 config DEBUG_BUGVERBOSE 158 config DEBUG_BUGVERBOSE
161 bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED 159 bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
162 depends on BUG 160 depends on BUG
163 depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV 161 depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV
164 default !EMBEDDED 162 default !EMBEDDED
165 help 163 help
166 Say Y here to make BUG() panics output the file name and line number 164 Say Y here to make BUG() panics output the file name and line number
167 of the BUG call as well as the EIP and oops trace. This aids 165 of the BUG call as well as the EIP and oops trace. This aids
168 debugging but costs about 70-100K of memory. 166 debugging but costs about 70-100K of memory.
169 167
170 config DEBUG_INFO 168 config DEBUG_INFO
171 bool "Compile the kernel with debug info" 169 bool "Compile the kernel with debug info"
172 depends on DEBUG_KERNEL 170 depends on DEBUG_KERNEL
173 help 171 help
174 If you say Y here the resulting kernel image will include 172 If you say Y here the resulting kernel image will include
175 debugging info resulting in a larger kernel image. 173 debugging info resulting in a larger kernel image.
176 Say Y here only if you plan to debug the kernel. 174 Say Y here only if you plan to debug the kernel.
177 175
178 If unsure, say N. 176 If unsure, say N.
179 177
180 config DEBUG_FS 178 config DEBUG_FS
181 bool "Debug Filesystem" 179 bool "Debug Filesystem"
182 depends on SYSFS 180 depends on SYSFS
183 help 181 help
184 debugfs is a virtual file system that kernel developers use to put 182 debugfs is a virtual file system that kernel developers use to put
185 debugging files into. Enable this option to be able to read and 183 debugging files into. Enable this option to be able to read and
186 write to these files. 184 write to these files.
187 185
188 If unsure, say N. 186 If unsure, say N.
189 187
190 config DEBUG_VM 188 config DEBUG_VM
191 bool "Debug VM" 189 bool "Debug VM"
192 depends on DEBUG_KERNEL 190 depends on DEBUG_KERNEL
193 help 191 help
194 Enable this to turn on extended checks in the virtual-memory system 192 Enable this to turn on extended checks in the virtual-memory system
195 that may impact performance. 193 that may impact performance.
196 194
197 If unsure, say N. 195 If unsure, say N.
198 196
199 config FRAME_POINTER 197 config FRAME_POINTER
200 bool "Compile the kernel with frame pointers" 198 bool "Compile the kernel with frame pointers"
201 depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML) 199 depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML)
202 default y if DEBUG_INFO && UML 200 default y if DEBUG_INFO && UML
203 help 201 help
204 If you say Y here the resulting kernel image will be slightly larger 202 If you say Y here the resulting kernel image will be slightly larger
205 and slower, but it might give very useful debugging information on 203 and slower, but it might give very useful debugging information on
206 some architectures or if you use external debuggers. 204 some architectures or if you use external debuggers.
207 If you don't debug the kernel, you can say N. 205 If you don't debug the kernel, you can say N.
208 206
209 config UNWIND_INFO 207 config UNWIND_INFO
210 bool "Compile the kernel with frame unwind information" 208 bool "Compile the kernel with frame unwind information"
211 depends on !IA64 && !PARISC 209 depends on !IA64 && !PARISC
212 depends on !MODULES || !(MIPS || PPC || SUPERH || V850) 210 depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
213 help 211 help
214 If you say Y here the resulting kernel image will be slightly larger 212 If you say Y here the resulting kernel image will be slightly larger
215 but not slower, and it will give very useful debugging information. 213 but not slower, and it will give very useful debugging information.
216 If you don't debug the kernel, you can say N, but we may not be able 214 If you don't debug the kernel, you can say N, but we may not be able
217 to solve problems without frame unwind information or frame pointers. 215 to solve problems without frame unwind information or frame pointers.
218 216
219 config STACK_UNWIND 217 config STACK_UNWIND
220 bool "Stack unwind support" 218 bool "Stack unwind support"
221 depends on UNWIND_INFO 219 depends on UNWIND_INFO
222 depends on X86 220 depends on X86
223 help 221 help
224 This enables more precise stack traces, omitting all unrelated 222 This enables more precise stack traces, omitting all unrelated
225 occurrences of pointers into kernel code from the dump. 223 occurrences of pointers into kernel code from the dump.
226 224
227 config FORCED_INLINING 225 config FORCED_INLINING
228 bool "Force gcc to inline functions marked 'inline'" 226 bool "Force gcc to inline functions marked 'inline'"
229 depends on DEBUG_KERNEL 227 depends on DEBUG_KERNEL
230 default y 228 default y
231 help 229 help
232 This option determines if the kernel forces gcc to inline the functions 230 This option determines if the kernel forces gcc to inline the functions
233 developers have marked 'inline'. Doing so takes away freedom from gcc to 231 developers have marked 'inline'. Doing so takes away freedom from gcc to
234 do what it thinks is best, which is desirable for the gcc 3.x series of 232 do what it thinks is best, which is desirable for the gcc 3.x series of
235 compilers. The gcc 4.x series have a rewritten inlining algorithm and 233 compilers. The gcc 4.x series have a rewritten inlining algorithm and
236 disabling this option will generate a smaller kernel there. Hopefully 234 disabling this option will generate a smaller kernel there. Hopefully
237 this algorithm is so good that allowing gcc4 to make the decision can 235 this algorithm is so good that allowing gcc4 to make the decision can
238 become the default in the future, until then this option is there to 236 become the default in the future, until then this option is there to
239 test gcc for this. 237 test gcc for this.
240 238
241 config RCU_TORTURE_TEST 239 config RCU_TORTURE_TEST
242 tristate "torture tests for RCU" 240 tristate "torture tests for RCU"
243 depends on DEBUG_KERNEL 241 depends on DEBUG_KERNEL
244 default n 242 default n
245 help 243 help
246 This option provides a kernel module that runs torture tests 244 This option provides a kernel module that runs torture tests
247 on the RCU infrastructure. The kernel module may be built 245 on the RCU infrastructure. The kernel module may be built
248 after the fact on the running kernel to be tested, if desired. 246 after the fact on the running kernel to be tested, if desired.
249 247
250 Say Y here if you want RCU torture tests to start automatically 248 Say Y here if you want RCU torture tests to start automatically
251 at boot time (you probably don't). 249 at boot time (you probably don't).
252 Say M if you want the RCU torture tests to build as a module. 250 Say M if you want the RCU torture tests to build as a module.
253 Say N if you are unsure. 251 Say N if you are unsure.
254 252