Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d314d74c authored by Cong Wang's avatar Cong Wang Committed by Linus Torvalds
Browse files

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: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: David Howells <dhowells@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b502bd11

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ config HAVE_KRETPROBES 


config HAVE_OPTPROBES

	bool



config HAVE_NMI_WATCHDOG

	bool

#

# An arch should select this if it provides all these things:

#

arch/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/blackfin/include/asm/irq.h

+0 −4
Original line number Diff line number Diff line
@@ -38,8 +38,4 @@ 


#include <asm-generic/irq.h>



#ifdef CONFIG_NMI_WATCHDOG

# define ARCH_HAS_NMI_WATCHDOG

#endif



#endif				/* _BFIN_IRQ_H_ */

arch/mn10300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config MN10300 
	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_KGDB

	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER



config AM33_2

	def_bool n

arch/mn10300/include/asm/reset-regs.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 


#ifdef __KERNEL__



#ifdef CONFIG_MN10300_WD_TIMER

#define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */

#endif



/*

 * watchdog timer registers

 */