The patch titled watchdog: fix if (...) \n #if... cases missing semicolons when false has been removed from the -mm tree. Its filename was watchdog-fix-if-n-if-cases-missing-semicolons-when-false.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: watchdog: fix if (...) \n #if... cases missing semicolons when false From: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/wdt.c | 3 ++- drivers/watchdog/wdt_pci.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/scsi/osst.c~watchdog-fix-if-n-if-cases-missing-semicolons-when-false drivers/scsi/osst.c diff -puN drivers/watchdog/wdt.c~watchdog-fix-if-n-if-cases-missing-semicolons-when-false drivers/watchdog/wdt.c --- a/drivers/watchdog/wdt.c~watchdog-fix-if-n-if-cases-missing-semicolons-when-false +++ a/drivers/watchdog/wdt.c @@ -253,7 +253,7 @@ static irqreturn_t wdt_interrupt(int irq 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"); @@ -264,6 +264,7 @@ static irqreturn_t wdt_interrupt(int irq #else printk(KERN_CRIT "Reset in 5ms.\n"); #endif + } return IRQ_HANDLED; } diff -puN drivers/watchdog/wdt_pci.c~watchdog-fix-if-n-if-cases-missing-semicolons-when-false drivers/watchdog/wdt_pci.c --- a/drivers/watchdog/wdt_pci.c~watchdog-fix-if-n-if-cases-missing-semicolons-when-false +++ a/drivers/watchdog/wdt_pci.c @@ -298,7 +298,7 @@ static irqreturn_t wdtpci_interrupt(int 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"); @@ -309,6 +309,7 @@ static irqreturn_t wdtpci_interrupt(int #else printk(KERN_CRIT PFX "Reset in 5ms.\n"); #endif + } return IRQ_HANDLED; } _ Patches currently in -mm which might be from ilpo.jarvinen@xxxxxxxxxxx are origin.patch scsi-fix-if-n-if-cases-missing-semicolons-when-false.patch git-watchdog.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html