Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[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>
Andrew Morton 15 years ago
parent
168b5251ad
commit
c1bf3acffc
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/watchdog/wdt.c
  2. 1 1
      drivers/watchdog/wdt_pci.c

+ 1 - 1
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 status;
 
 
-	static struct watchdog_info ident = {
 
+	struct watchdog_info ident = {
 
 		.options =		WDIOF_SETTIMEOUT|
 
 					WDIOF_MAGICCLOSE|
 
 					WDIOF_KEEPALIVEPING,

+ 1 - 1
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 status;
 
 
-	static struct watchdog_info ident = {
 
+	struct watchdog_info ident = {
 
 		.options =		WDIOF_SETTIMEOUT|
 
 					WDIOF_MAGICCLOSE|
 
 					WDIOF_KEEPALIVEPING,