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 /arch/blackfin/Kconfig | |
| 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 'arch/blackfin/Kconfig')
| -rw-r--r-- | arch/blackfin/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index abe5a9e8514..c1269a1085e 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -36,6 +36,7 @@ config BLACKFIN | |||
| 36 | select GENERIC_ATOMIC64 | 36 | select GENERIC_ATOMIC64 |
| 37 | select GENERIC_IRQ_PROBE | 37 | select GENERIC_IRQ_PROBE |
| 38 | select IRQ_PER_CPU if SMP | 38 | select IRQ_PER_CPU if SMP |
| 39 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG | ||
| 39 | 40 | ||
| 40 | config GENERIC_CSUM | 41 | config GENERIC_CSUM |
| 41 | def_bool y | 42 | def_bool y |