summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/Kconfig
diff options
context:
space:
mode:
authorCong Wang2012-03-23 23:01:51 +0100
committerLinus Torvalds2012-03-24 00:58:31 +0100
commitd314d74c695f967e10598467a326f41c78ed1e20 (patch)
tree71fabe9cf1f2b99f16f7f9cc3f809955038a2d0c /arch/blackfin/Kconfig
parentmagic.h: move some FS magic numbers into magic.h (diff)
downloadkernel-qcow2-linux-d314d74c695f967e10598467a326f41c78ed1e20.tar.gz
kernel-qcow2-linux-d314d74c695f967e10598467a326f41c78ed1e20.tar.xz
kernel-qcow2-linux-d314d74c695f967e10598467a326f41c78ed1e20.zip
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 'arch/blackfin/Kconfig')
-rw-r--r--arch/blackfin/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index abe5a9e85148..c1269a1085e1 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -36,6 +36,7 @@ config BLACKFIN
select GENERIC_ATOMIC64
select GENERIC_IRQ_PROBE
select IRQ_PER_CPU if SMP
+ select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
config GENERIC_CSUM
def_bool y