From: Andrew Morton Date: Wed, 3 Mar 2010 19:57:40 +0000 (-0800) Subject: [WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static X-Git-Tag: v2.6.34-rc1~2^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383;p=linux.git [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 Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index 3bbefe9a2634..bfda2e99dd89 100644 --- 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 f368dd87083a..7b22e3cdbc81 100644 --- 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,