From 6c7b6c0cd13f934406ade1a818e7035353c1c6d1 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 3 Aug 2004 17:56:53 +0100 Subject: [PATCH] [CPUFREQ] Better fix for previous speedstep-ich breakage. Do away with the prototype by just moving some code around. Signed-off-by: Andrew Morton Signed-off-by: Dave Jones --- arch/i386/kernel/cpu/cpufreq/speedstep-ich.c | 37 +++++++++----------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c index d34e3cc82206f..e18ca99569860 100644 --- a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c @@ -64,8 +64,6 @@ static struct cpufreq_frequency_table speedstep_freqs[] = { #endif -static unsigned int speedstep_get(unsigned int cpu); - /** * speedstep_set_state - set the SpeedStep state * @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH) @@ -228,6 +226,23 @@ static unsigned int speedstep_detect_chipset (void) return 0; } +static unsigned int speedstep_get(unsigned int cpu) +{ + unsigned int speed; + cpumask_t cpus_allowed,affected_cpu_map; + + /* only run on CPU to be set, or on its sibling */ + cpus_allowed = current->cpus_allowed; +#ifdef CONFIG_SMP + affected_cpu_map = cpu_sibling_map[cpu]; +#else + affected_cpu_map = cpumask_of_cpu(cpu); +#endif + set_cpus_allowed(current, affected_cpu_map); + speed=speedstep_get_processor_frequency(speedstep_processor); + set_cpus_allowed(current, cpus_allowed); + return speed; +} /** * speedstep_target - set a new CPUFreq policy @@ -361,24 +376,6 @@ static int speedstep_cpu_exit(struct cpufreq_policy *policy) return 0; } -static unsigned int speedstep_get(unsigned int cpu) -{ - unsigned int speed; - cpumask_t cpus_allowed,affected_cpu_map; - - /* only run on CPU to be set, or on its sibling */ - cpus_allowed = current->cpus_allowed; -#ifdef CONFIG_SMP - affected_cpu_map = cpu_sibling_map[cpu]; -#else - affected_cpu_map = cpumask_of_cpu(cpu); -#endif - set_cpus_allowed(current, affected_cpu_map); - speed=speedstep_get_processor_frequency(speedstep_processor); - set_cpus_allowed(current, cpus_allowed); - return speed; -} - static struct freq_attr* speedstep_attr[] = { &cpufreq_freq_attr_scaling_available_freqs, NULL, -- 2.53.0