[GIT PULL REQUEST] watchdog - v3.0-rc7 - Fixes

From: Wim Van Sebroeck
Date: Sat Jul 16 2011 - 02:09:48 EST

Hi Linus,

Please pull from 'master' branch of
or if master.kernel.org hasn't synced up yet:

This will update the following files:

drivers/watchdog/Kconfig | 1 -
1 file changed, 1 deletion(-)

with these Changes:

Author: Olaf Hering <olaf@xxxxxxxxx>
Date: Fri Jul 15 23:23:33 2011 +0200

watchdog: fix hpwdt Kconfig regression in 3.0-rc

Remove Kconfig regression caused by commit
a4616153deae053b29a2b7dd9ec4b2a225accfc5 "watchdog: hpwdt: build hpwdt as
module by default with NMI_DECODING enabled"

With the above change applied, hpwdt will be enabled unconditionally by just
entering the Watchdog subscreen in menuconfig. Since this driver is not
essential to boot any box it should remain disabled until it gets manually
enabled, just like all other drivers.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Cc: Tony Camuso <tcamuso@xxxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

The Changes can also be looked at on:

For completeness, I added the overal diff below.


diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9536d38..c57419b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -600,7 +600,6 @@ config IT87_WDT
tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
depends on X86
- default m
A software monitoring watchdog and NMI sourcing driver. This driver
will detect lockups and provide a stack trace. This is a driver that
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/