commit 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15
author Ingo Molnar <mingo@elte.hu> Thu Feb 12 13:10:17 2009 +0100
committer Ingo Molnar <mingo@elte.hu> Thu Feb 12 17:08:15 2009 +0100
tree 190c8d2cd289c9588376f85b3d5d61828c8c1c05
parent 871cafcc962fa1655c44b4f0e54d4c5cc14e273c

softlockup: move 'one' to the softlockup section in sysctl.c

CONFIG_SOFTLOCKUP=y || CONFIG_DETECT_HUNG_TASKS=y is now the only user
of the 'one' constant in kernel/sysctl.c. Move it to the softlockup
block of constants.

This fixes a GCC warning.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 3b6b54c..6d2aeff 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -90,6 +90,9 @@
 #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 @@
 #endif
 
 static int zero;
-static int one = 1;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;