You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Don Zickus 4a7863cc2e x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR ... The x86 arch has shifted its use of the nmi_watchdog from a local implementation to the global one provide by kernel/watchdog.c. This shift has caused a whole bunch of compile problems under different config options. I attempt to simplify things with the patch below. In order to simplify things, I had to come to terms with the meaning of two terms ARCH_HAS_NMI_WATCHDOG and CONFIG_HARDLOCKUP_DETECTOR. Basically they mean the same thing, the former on a local level and the latter on a global level. With the old x86 nmi watchdog gone, there is no need to rely on defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't make sense any more. x86 will now use the global implementation. The changes below do a few things. First it changes the few places that relied on ARCH_HAS_NMI_WATCHDOG to use CONFIG_X86_LOCAL_APIC (the former was an alias for the latter anyway, so nothing unusual here). Those pieces of code were relying more on local apic functionality the nmi watchdog functionality, so the change should make sense. Second, I removed the x86 implementation of touch_nmi_watchdog(). It isn't need now, instead x86 will rely on kernel/watchdog.c's implementation. Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from x86. And tweaked the include/linux/nmi.h file to tell users to look for an externally defined touch_nmi_watchdog in the case of ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This changes removes some of the ugliness in that file. Finally, I added a Kconfig dependency for CONFIG_HARDLOCKUP_DETECTOR that said you can't have ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR. You can only have one nmi_watchdog. Tested with ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig, (various broken configs) Hopefully, after this patch I won't get any more compile broken emails. :-) v3: changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct function prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set. Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: fweisbec@gmail.com LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>		14 years ago
..
accessibility	…
acpi	Merge commit 'v2.6.37-rc7' into perf/core	14 years ago
amba	…
ata	sata_via: apply magic FIFO fix to vt6420 too	14 years ago
atm	atm: correct sysfs 'device' link creation and parent relationships	14 years ago
auxdisplay	…
base	PM: Allow devices to be removed during late suspend and early resume	14 years ago
block	Fix build error in drivers/block/cciss.c	14 years ago
bluetooth	Bluetooth: Add new PID for Atheros 3011	14 years ago
cdrom	…
char	agp/intel: Fix wrong kunmap in i830_cleanup()	14 years ago
clocksource	clocksource: sh_cmt: Remove nested spinlock fix	14 years ago
connector	connector: add module alias	14 years ago
cpufreq	…
cpuidle	…
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	14 years ago
dca	…
dio	…
dma	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	14 years ago
edac	amd64_edac: Fix interleaving check	14 years ago
eisa	…
firewire	firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI	14 years ago
firmware	…
gpio	cs5535-gpio: apply CS5536 errata workaround for GPIOs	14 years ago
gpu	drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP	14 years ago
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	14 years ago
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging	14 years ago
i2c	i2c_intel_mid: Fix slash in sysfs name	14 years ago
ide	…
idle	intel_idle: recognize ARAT on WSM-EX	14 years ago
ieee802154	…
infiniband	IB/uverbs: Handle large number of entries in poll CQ	14 years ago
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	14 years ago
isdn	isdn: icn: Fix stack corruption bug.	14 years ago
leds	leds: fix up dependencies	14 years ago
lguest	…
macintosh	leds: fix up dependencies	14 years ago
mca	…
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	14 years ago
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	14 years ago
memstick	…
message	SCSI host lock push-down	14 years ago
mfd	…
misc	drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove()	14 years ago
mmc	mmc: sdhci: 8-bit bus width changes	14 years ago
mtd	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	14 years ago
net	xen: Provide a variant of __RING_SIZE() that is an integer constant expression	14 years ago
nubus	…
of	…
oprofile	…
parisc	parisc: KittyHawk LCD fix	14 years ago
parport	…
pci	Merge branches 'x86-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	14 years ago
pcmcia	ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.	14 years ago
platform	wmi: use memcmp instead of strncmp to compare GUIDs	14 years ago
pnp	ACPI/PNP: avoid section mismatch warning	14 years ago
power	…
pps	…
ps3	…
rapidio	rapidio: use resource_size()	14 years ago
regulator	regulator: tps6586x: correct register table	14 years ago
rtc	Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent	14 years ago
s390	[SCSI] zfcp: Issue FCP command without holding SCSI host_lock	14 years ago
sbus	…
scsi	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	14 years ago
serial	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	14 years ago
sfi	…
sh	Merge branch 'common/clkfwk' into sh-fixes-for-linus	14 years ago
sn	…
spi	dw_spi: Fix missing final read in some polling situations	14 years ago
ssb	ssb: b43-pci-bridge: Add new vendor for BCM4318	14 years ago
staging	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	14 years ago
tc	…
telephony	…
thermal	…
tty	n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked	14 years ago
uio	uio: Change mail address of Hans J. Koch	14 years ago
usb	Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	14 years ago
uwb	UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails	14 years ago
vhost	vhost: correctly set bits of dirty pages	14 years ago
video	Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus	14 years ago
virtio	virtio: fix format of sysfs driver/vendor files	14 years ago
vlynq	…
w1	…
watchdog	x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR	14 years ago
xen	Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	14 years ago
zorro	BKL: remove extraneous #include <smp_lock.h>	14 years ago
Kconfig	…
Makefile	TTY: create drivers/tty and move the tty core files there	14 years ago