diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-23 18:01:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:31 -0400 |
commit | d314d74c695f967e10598467a326f41c78ed1e20 (patch) | |
tree | 71fabe9cf1f2b99f16f7f9cc3f809955038a2d0c /lib | |
parent | b502bd1152472dc1b98c60434f23c23b280c7b94 (diff) |
nmi watchdog: do not use cpp symbol in Kconfig
ARCH_HAS_NMI_WATCHDOG is a macro defined by arch, but config
HARDLOCKUP_DETECTOR depends on it. This is wrong, ARCH_HAS_NMI_WATCHDOG
has to be a Kconfig config, and arch's need it should select it
explicitly.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Cc: David Howells <dhowells@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 05037dc9bde7..391003f7ab46 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -184,7 +184,7 @@ config LOCKUP_DETECTOR | |||
184 | 184 | ||
185 | config HARDLOCKUP_DETECTOR | 185 | config HARDLOCKUP_DETECTOR |
186 | def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \ | 186 | def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \ |
187 | !ARCH_HAS_NMI_WATCHDOG | 187 | !HAVE_NMI_WATCHDOG |
188 | 188 | ||
189 | config BOOTPARAM_HARDLOCKUP_PANIC | 189 | config BOOTPARAM_HARDLOCKUP_PANIC |
190 | bool "Panic (Reboot) On Hard Lockups" | 190 | bool "Panic (Reboot) On Hard Lockups" |