summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2010-11-06 02:17:39 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-06 03:45:35 +0300
commit433039e97f672b81e6c8f6daef385dcf035c6e29 (patch)
tree0b4b181cf1db4019ae34dccc49e06945e4df117b /kernel
parent4b4a2700f462102569b407102c60d3b9cf4432a0 (diff)
downloadlinux-433039e97f672b81e6c8f6daef385dcf035c6e29.tar.xz
watchdog: Fix section mismatch and potential undefined behavior.
Commit d9ca07a05ce1 ("watchdog: Avoid kernel crash when disabling watchdog") introduces a section mismatch. Now that we reference no_watchdog from non-__init code it can no longer be __initdata. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Cc: Stephane Eranian <eranian@google.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/watchdog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index bafba687a6d8..6e3c41a4024c 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -43,7 +43,7 @@ static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
#endif
-static int __initdata no_watchdog;
+static int no_watchdog;
/* boot commands */