Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1bf3acf authored Mar 03, 2010 by Andrew Morton Committed by Wim Van Sebroeck Mar 07, 2010

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

parent 168b5251

drivers/watchdog/wdt.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,

drivers/watchdog/wdt_pci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,