diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2010-03-03 11:57:40 -0800 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-03-07 10:31:05 +0000 |
| commit | c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383 (patch) | |
| tree | a001380b967c60c0bff3c0a93c3b3fe5c4a33d3e /drivers/watchdog | |
| parent | 168b5251adddb1554926cfb94f79a8a28bc6ebe5 (diff) | |
| download | op-kernel-dev-c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383.zip op-kernel-dev-c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383.tar.gz | |
[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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/wdt_pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index 3bbefe9..bfda2e9 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 f368dd8..7b22e3c 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, |
