iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Andrew Morton 2010-03-03 11:57:40 -08:00 committed by Wim Van Sebroeck
parent 168b5251ad
commit c1bf3acffc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/wdt.c
View File

@ -358,7 +358,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
int new_heartbeat; int new_heartbeat;
int status; int status;
static struct watchdog_info ident = { struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT| .options = WDIOF_SETTIMEOUT|
WDIOF_MAGICCLOSE| WDIOF_MAGICCLOSE|
WDIOF_KEEPALIVEPING, WDIOF_KEEPALIVEPING,

2
drivers/watchdog/wdt_pci.c
View File

@ -412,7 +412,7 @@ static long wdtpci_ioctl(struct file *file, unsigned int cmd,
int new_heartbeat; int new_heartbeat;
int status; int status;
static struct watchdog_info ident = { struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT| .options = WDIOF_SETTIMEOUT|
WDIOF_MAGICCLOSE| WDIOF_MAGICCLOSE|
WDIOF_KEEPALIVEPING, WDIOF_KEEPALIVEPING,