Skip to content

Commit

Permalink
[WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Wim Van Sebroeck committed Mar 7, 2010
1 parent 168b525 commit c1bf3ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/watchdog/wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/watchdog/wdt_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit c1bf3ac

Please sign in to comment.