From: Andrew Morton <akpm@linux-foundation.org>

Fix the CONFIG_DETECT_SOFTLOCKUP=y build.

This is getting silly.

Cc: Bron Gondwana <brong@fastmail.fm>
Cc: Ethan Solomita <solo@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: WU Fengguang <wfg@mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sysctl.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff -puN kernel/sysctl.c~mm-page-writeback-highmem_is_dirtyable-option-fix kernel/sysctl.c
--- a/kernel/sysctl.c~mm-page-writeback-highmem_is_dirtyable-option-fix
+++ a/kernel/sysctl.c
@@ -83,8 +83,11 @@ extern int sysctl_stat_interval;
 extern int audit_argv_kb;
 
 /* Constants used for minimum and  maximum */
-#ifdef CONFIG_DETECT_SOFTLOCKUP
+#if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
 static int one = 1;
+#endif
+
+#ifdef CONFIG_DETECT_SOFTLOCKUP
 static int sixty = 60;
 #endif
 
@@ -93,7 +96,6 @@ static int two = 2;
 #endif
 
 static int zero;
-static int one = 1;
 static int one_hundred = 100;
 
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
_