From 0204e7b46290494ab8a83daf75abe9e9e24859d8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 12 Feb 2009 13:10:17 +0100
Subject: [PATCH] --- yaml --- r: 142793 b: refs/heads/master c:
 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15 h: refs/heads/master i:   142791:
 a6dc75da3d3ede05b9d188dc9866289133f99611 v: v3

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

diff --git a/[refs] b/[refs]
index 7c7dee8cbe4b..77c8f2fcc8fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 871cafcc962fa1655c44b4f0e54d4c5cc14e273c
+refs/heads/master: 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 3b6b54c8ac0d..6d2aeff92b3d 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -90,6 +90,9 @@ extern int rcutorture_runnable;
 #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
 
 /* Constants used for minimum and  maximum */
+#if defined(CONFIG_DETECT_HUNG_TASK) || defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
+static int one = 1;
+#endif
 #ifdef CONFIG_DETECT_SOFTLOCKUP
 static int sixty = 60;
 static int neg_one = -1;
@@ -100,7 +103,6 @@ static int two = 2;
 #endif
 
 static int zero;
-static int one = 1;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;