From fb45953e5b8285bfc2a3e860c86b664ea81744ab Mon Sep 17 00:00:00 2001
From: Vasily Averin <vvs@sw.ru>
Date: Mon, 31 Oct 2011 17:11:18 -0700
Subject: [PATCH] --- yaml --- r: 272189 b: refs/heads/master c:
 4ff819515b203f937cc6c8a0215a37a68d1ee71f h: refs/heads/master i:   272187:
 d706f55c5a93b8c411328ced766f6a28cbf329eb v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ab2bd2500b45..84e3d9b66af9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f445027e4e692bd885118460b292d08027fd5501
+refs/heads/master: 4ff819515b203f937cc6c8a0215a37a68d1ee71f
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index d680381b0e9c..1d7bca7f4f52 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -481,6 +481,8 @@ static void watchdog_disable(int cpu)
 	}
 }
 
+/* sysctl functions */
+#ifdef CONFIG_SYSCTL
 static void watchdog_enable_all_cpus(void)
 {
 	int cpu;
@@ -510,8 +512,6 @@ static void watchdog_disable_all_cpus(void)
 }
 
 
-/* sysctl functions */
-#ifdef CONFIG_SYSCTL
 /*
  * proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh
  */