tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Andrew Morton and committed by Wim Van Sebroeck c1bf3acf 168b5251

+2 -2
unified split
+1 -1
drivers/watchdog/wdt.c
··· 358 358 int new_heartbeat; 359 359 int status; 360 360 361 - static struct watchdog_info ident = { 361 + struct watchdog_info ident = { 362 362 .options = WDIOF_SETTIMEOUT| 363 363 WDIOF_MAGICCLOSE| 364 364 WDIOF_KEEPALIVEPING,
+1 -1
drivers/watchdog/wdt_pci.c
··· 412 412 int new_heartbeat; 413 413 int status; 414 414 415 - static struct watchdog_info ident = { 415 + struct watchdog_info ident = { 416 416 .options = WDIOF_SETTIMEOUT| 417 417 WDIOF_MAGICCLOSE| 418 418 WDIOF_KEEPALIVEPING,