From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 11 Mar 2010 09:16:55 +0000 (+0000)
Subject: define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init messa... 
X-Git-Tag: reboot~20703
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e8a5478877ca8fef84b2c0f8dc15536363b102a;p=oweals%2Fopenwrt.git

define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init message Patch from Bernhard Loos.

SVN-Revision: 20134
---

diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
index 0281485c5d..21caed8b76 100644
--- a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
+++ b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
@@ -81,6 +81,8 @@ static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, const struct pci_dev
 		return err;
 	}
 
+	panic_on_unrecovered_nmi = 1;
+
 	err = platform_device_register(&rdc321x_gpio_device);
 	if (err) {
 		dev_err(&pdev->dev, "failed to register gpiochip\n");
diff --git a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
index 3ced6c9a21..2572c0e2cb 100644
--- a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
+++ b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
@@ -244,7 +244,7 @@ static int __init rdc321x_wdt_probe(struct platform_device *pdev)
 	}
 
 	panic_on_unrecovered_nmi = 1;
-	dev_info(&pdev->dev, "watchdog inig success\n");
+	dev_info(&pdev->dev, "watchdog init success\n");
 
 	return 0;
 }