[WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 3 Mar 2010 19:57:40 +0000 (11:57 -0800)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 7 Mar 2010 10:31:05 +0000 (10:31 +0000)
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>
drivers/watchdog/wdt.c
drivers/watchdog/wdt_pci.c

index 3bbefe9a2634d5af1e432ed4496f7294e360e64a..bfda2e99dd8908ffeb0d23e24c3b12dc92f682c8 100644 (file)
@@ -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,
index f368dd87083acaeed267eba6e7d20a51cf5b3060..7b22e3cdbc81685a4dbd59ba9daa4e536ca4572d 100644 (file)
@@ -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,