* [PATCH] adjust hard-lockup related Kconfig options
@ 2012-09-10 11:54 Jan Beulich
2012-09-10 13:32 ` Don Zickus
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2012-09-10 11:54 UTC (permalink / raw)
To: akpm; +Cc: a.p.zijlstra, dzickus, linux-kernel
The main option should not appear in the resulting .config when the
dependencies aren't met (i.e. use "depends on" rather than directly
setting the default from the combined dependency values).
The sub-options should depend on the main option rather than a more
generic higher level one.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
lib/Kconfig.debug | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- 3.6-rc5/lib/Kconfig.debug
+++ 3.6-rc5-kconfig-cleanup-hardlockup/lib/Kconfig.debug
@@ -196,12 +196,13 @@ config LOCKUP_DETECTOR
thresholds can be controlled through the sysctl watchdog_thresh.
config HARDLOCKUP_DETECTOR
- def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \
- !HAVE_NMI_WATCHDOG
+ def_bool y
+ depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG
+ depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
config BOOTPARAM_HARDLOCKUP_PANIC
bool "Panic (Reboot) On Hard Lockups"
- depends on LOCKUP_DETECTOR
+ depends on HARDLOCKUP_DETECTOR
help
Say Y here to enable the kernel to panic on "hard lockups",
which are bugs that cause the kernel to loop in kernel
@@ -212,7 +213,7 @@ config BOOTPARAM_HARDLOCKUP_PANIC
config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
int
- depends on LOCKUP_DETECTOR
+ depends on HARDLOCKUP_DETECTOR
range 0 1
default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
default 1 if BOOTPARAM_HARDLOCKUP_PANIC
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] adjust hard-lockup related Kconfig options
2012-09-10 11:54 [PATCH] adjust hard-lockup related Kconfig options Jan Beulich
@ 2012-09-10 13:32 ` Don Zickus
0 siblings, 0 replies; 2+ messages in thread
From: Don Zickus @ 2012-09-10 13:32 UTC (permalink / raw)
To: Jan Beulich; +Cc: akpm, a.p.zijlstra, linux-kernel
On Mon, Sep 10, 2012 at 12:54:07PM +0100, Jan Beulich wrote:
> The main option should not appear in the resulting .config when the
> dependencies aren't met (i.e. use "depends on" rather than directly
> setting the default from the combined dependency values).
>
> The sub-options should depend on the main option rather than a more
> generic higher level one.
Looks good to me.
Acked-by: Don Zickus <dzickus@redhat.com>
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> Cc: Don Zickus <dzickus@redhat.com>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
>
> ---
> lib/Kconfig.debug | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> --- 3.6-rc5/lib/Kconfig.debug
> +++ 3.6-rc5-kconfig-cleanup-hardlockup/lib/Kconfig.debug
> @@ -196,12 +196,13 @@ config LOCKUP_DETECTOR
> thresholds can be controlled through the sysctl watchdog_thresh.
>
> config HARDLOCKUP_DETECTOR
> - def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \
> - !HAVE_NMI_WATCHDOG
> + def_bool y
> + depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG
> + depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
>
> config BOOTPARAM_HARDLOCKUP_PANIC
> bool "Panic (Reboot) On Hard Lockups"
> - depends on LOCKUP_DETECTOR
> + depends on HARDLOCKUP_DETECTOR
> help
> Say Y here to enable the kernel to panic on "hard lockups",
> which are bugs that cause the kernel to loop in kernel
> @@ -212,7 +213,7 @@ config BOOTPARAM_HARDLOCKUP_PANIC
>
> config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
> int
> - depends on LOCKUP_DETECTOR
> + depends on HARDLOCKUP_DETECTOR
> range 0 1
> default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
> default 1 if BOOTPARAM_HARDLOCKUP_PANIC
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-10 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-10 11:54 [PATCH] adjust hard-lockup related Kconfig options Jan Beulich
2012-09-10 13:32 ` Don Zickus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).