diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 13:10:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 17:08:15 +0100 |
| commit | 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15 (patch) | |
| tree | 190c8d2cd289c9588376f85b3d5d61828c8c1c05 /kernel/sysctl.c | |
| parent | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (diff) | |
| download | op-kernel-dev-9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15.zip op-kernel-dev-9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15.tar.gz | |
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>
Diffstat (limited to 'kernel/sysctl.c')
| -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 3b6b54c..6d2aeff 100644 --- a/kernel/sysctl.c +++ b/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; |
