2009-07-08 19:24:47

by Daniel Mack

Subject: [PATCH] cpufreq: unbreak build for !CONFIG_SMP

'managed_policy' is used for the non-smp case in line 941.

Remove #ifdef CONFIG_SMP for its declaration in order to make cpufreq.c
build on systems with CONFIG_SMP=n.

Signed-off-by: Daniel Mack <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Venkatesh Pallipadi <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Shaohua Li <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Dave Young <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Thomas Renninger <[email protected]>
Cc: Dave Jones <[email protected]>
---
drivers/cpufreq/cpufreq.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index c668ac8..d160867 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -776,9 +776,7 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
struct sys_device *cpu_sys_dev;
unsigned long flags;
unsigned int j;
-#ifdef CONFIG_SMP
struct cpufreq_policy *managed_policy;
-#endif

if (cpu_is_offline(cpu))
return 0;
--
1.6.3.1

2009-07-09 08:43:55

by Thomas Renninger

Subject: [PATCH] cpufreq: Unbreak build for !SMP: symlinked cpus cannot happen for !SMP

Or like that:
Either all #ifdef CONFIG_SMP related conditionals to managed cpus
should vanish or all should be covered. This one takes the latter
approach.

---
'managed_policy' is used for the non-smp case in line 941.

Make the symlink code conditional to #ifdef CONFIG_SMP as already
done at other places.

Signed-off-by: Thomas Renninger <[email protected]>

Index: cpufreq/drivers/cpufreq/cpufreq.c
===================================================================
--- cpufreq.orig/drivers/cpufreq/cpufreq.c
+++ cpufreq/drivers/cpufreq/cpufreq.c
@@ -930,6 +930,7 @@ static int cpufreq_add_dev(struct sys_de
}
spin_unlock_irqrestore(&cpufreq_driver_lock, flags);

+#ifdef CONFIG_SMP
/* symlink affected CPUs */
for_each_cpu(j, policy->cpus) {
if (j == cpu)
@@ -947,6 +948,7 @@ static int cpufreq_add_dev(struct sys_de
goto err_out_unregister;
}
}
+#endif

policy->governor = NULL; /* to assure that the starting sequence is
* run in cpufreq_set_policy */

2009-07-09 08:48:57

by Daniel Mack

Subject: Re: [PATCH] cpufreq: Unbreak build for !SMP: symlinked cpus cannot happen for !SMP

On Thu, Jul 09, 2009 at 10:43:35AM +0200, Thomas Renninger wrote:
> Or like that:
> Either all #ifdef CONFIG_SMP related conditionals to managed cpus
> should vanish or all should be covered. This one takes the latter
> approach.

Dave Jones fixed it already, see

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5e1596f75395e7a402e1059c518e633d2732dcf8

Daniel




> ---
> 'managed_policy' is used for the non-smp case in line 941.
>
> Make the symlink code conditional to #ifdef CONFIG_SMP as already
> done at other places.
>
> Signed-off-by: Thomas Renninger <[email protected]>
>
> Index: cpufreq/drivers/cpufreq/cpufreq.c
> ===================================================================
> --- cpufreq.orig/drivers/cpufreq/cpufreq.c
> +++ cpufreq/drivers/cpufreq/cpufreq.c
> @@ -930,6 +930,7 @@ static int cpufreq_add_dev(struct sys_de
> }
> spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
>
> +#ifdef CONFIG_SMP
> /* symlink affected CPUs */
> for_each_cpu(j, policy->cpus) {
> if (j == cpu)
> @@ -947,6 +948,7 @@ static int cpufreq_add_dev(struct sys_de
> goto err_out_unregister;
> }
> }
> +#endif
>
> policy->governor = NULL; /* to assure that the starting sequence is
> * run in cpufreq_set_policy */
>