[WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static

Making this instance static exposes the code to SMP races, etc.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 3bbefe9..bfda2e9 100644 (file)
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -358,7 +358,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        int new_heartbeat;
        int status;
 
-       static struct watchdog_info ident = {
+       struct watchdog_info ident = {
                .options =              WDIOF_SETTIMEOUT|
                                        WDIOF_MAGICCLOSE|
                                        WDIOF_KEEPALIVEPING,

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index f368dd8..7b22e3c 100644 (file)
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -412,7 +412,7 @@ static long wdtpci_ioctl(struct file *file, unsigned int cmd,
        int new_heartbeat;
        int status;
 
-       static struct watchdog_info ident = {
+       struct watchdog_info ident = {
                .options =              WDIOF_SETTIMEOUT|
                                        WDIOF_MAGICCLOSE|
                                        WDIOF_KEEPALIVEPING,