Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: watchdog: Cleanup WATCHDOG_CORE help text watchdog: Fix POST failure on ASUS P5N32-E SLI and similar boards watchdog: shwdt: fix usage of mod_timer
This commit is contained in:
commit
4400478ba3
|
@ -36,9 +36,6 @@ config WATCHDOG_CORE
|
|||
and gives them the /dev/watchdog interface (and later also the
|
||||
sysfs interface).
|
||||
|
||||
To compile this driver as a module, choose M here: the module will
|
||||
be called watchdog.
|
||||
|
||||
config WATCHDOG_NOWAYOUT
|
||||
bool "Disable watchdog shutdown on close"
|
||||
help
|
||||
|
|
|
@ -458,7 +458,15 @@ static int __devexit nv_tco_remove(struct platform_device *dev)
|
|||
|
||||
static void nv_tco_shutdown(struct platform_device *dev)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
tco_timer_stop();
|
||||
|
||||
/* Some BIOSes fail the POST (once) if the NO_REBOOT flag is not
|
||||
* unset during shutdown. */
|
||||
pci_read_config_dword(tco_pci, MCP51_SMBUS_SETUP_B, &val);
|
||||
val &= ~MCP51_SMBUS_SETUP_B_TCO_REBOOT;
|
||||
pci_write_config_dword(tco_pci, MCP51_SMBUS_SETUP_B, val);
|
||||
}
|
||||
|
||||
static struct platform_driver nv_tco_driver = {
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
* misses its deadline, the kernel timer will allow the WDT to overflow.
|
||||
*/
|
||||
static int clock_division_ratio = WTCSR_CKS_4096;
|
||||
#define next_ping_period(cks) msecs_to_jiffies(cks - 4)
|
||||
#define next_ping_period(cks) (jiffies + msecs_to_jiffies(cks - 4))
|
||||
|
||||
static const struct watchdog_info sh_wdt_info;
|
||||
static struct platform_device *sh_wdt_dev;
|
||||
|
|
Loading…
Reference in a new issue