diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:10:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 11:08:15 -0500 |
commit | 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15 (patch) | |
tree | 190c8d2cd289c9588376f85b3d5d61828c8c1c05 | |
parent | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (diff) |
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>
-rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3b6b54c8ac0d..6d2aeff92b3d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -90,6 +90,9 @@ extern int rcutorture_runnable; | |||
90 | #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ | 90 | #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ |
91 | 91 | ||
92 | /* Constants used for minimum and maximum */ | 92 | /* Constants used for minimum and maximum */ |
93 | #if defined(CONFIG_DETECT_HUNG_TASK) || defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) | ||
94 | static int one = 1; | ||
95 | #endif | ||
93 | #ifdef CONFIG_DETECT_SOFTLOCKUP | 96 | #ifdef CONFIG_DETECT_SOFTLOCKUP |
94 | static int sixty = 60; | 97 | static int sixty = 60; |
95 | static int neg_one = -1; | 98 | static int neg_one = -1; |
@@ -100,7 +103,6 @@ static int two = 2; | |||
100 | #endif | 103 | #endif |
101 | 104 | ||
102 | static int zero; | 105 | static int zero; |
103 | static int one = 1; | ||
104 | static unsigned long one_ul = 1; | 106 | static unsigned long one_ul = 1; |
105 | static int one_hundred = 100; | 107 | static int one_hundred = 100; |
106 | 108 | ||