Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 72997
b: refs/heads/master
c: 59338d4
h: refs/heads/master
i:
  72995: e6aa7f5
v: v3
  • Loading branch information
Ilpo Jarvinen authored and Wim Van Sebroeck committed Oct 25, 2007
1 parent d868e99 commit 3ea108d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb0a38d8915b568a012888082dce731092b9803e
refs/heads/master: 59338d4cb68528062f294d95f116357265936076
3 changes: 2 additions & 1 deletion trunk/drivers/watchdog/wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
printk(KERN_CRIT "Possible fan fault.\n");
}
#endif /* CONFIG_WDT_501 */
if (!(status & WDC_SR_WCCR))
if (!(status & WDC_SR_WCCR)) {
#ifdef SOFTWARE_REBOOT
#ifdef ONLY_TESTING
printk(KERN_CRIT "Would Reboot.\n");
Expand All @@ -264,6 +264,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
#else
printk(KERN_CRIT "Reset in 5ms.\n");
#endif
}
return IRQ_HANDLED;
}

Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/watchdog/wdt_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
printk(KERN_CRIT PFX "Possible fan fault.\n");
}
#endif /* CONFIG_WDT_501_PCI */
if (!(status&WDC_SR_WCCR))
if (!(status&WDC_SR_WCCR)) {
#ifdef SOFTWARE_REBOOT
#ifdef ONLY_TESTING
printk(KERN_CRIT PFX "Would Reboot.\n");
Expand All @@ -309,6 +309,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
#else
printk(KERN_CRIT PFX "Reset in 5ms.\n");
#endif
}
return IRQ_HANDLED;
}

Expand Down

0 comments on commit 3ea108d

Please sign in to comment.