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

Fix various warnings and add definition of "two".

ug.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sysctl.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff -puN kernel/sysctl.c~softlockup-add-a-proc-tuning-parameter-fix kernel/sysctl.c
--- a/kernel/sysctl.c~softlockup-add-a-proc-tuning-parameter-fix
+++ a/kernel/sysctl.c
@@ -81,9 +81,16 @@ extern int sysctl_stat_interval;
 extern int audit_argv_kb;
 
 /* Constants used for minimum and  maximum */
+#ifdef CONFIG_DETECT_SOFTLOCKUP
 static int one = 1;
-static int zero;
 static int sixty = 60;
+#endif
+
+#ifdef CONFIG_MMU
+static int two = 2;
+#endif
+
+static int zero;
 static int one_hundred = 100;
 
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
_