diff options
-rw-r--r-- | arch/arm/mach-tegra/cpu-tegra.c | 1 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq-cpu0.c | 1 | ||||
-rw-r--r-- | drivers/cpufreq/db8500-cpufreq.c | 2 | ||||
-rw-r--r-- | drivers/cpufreq/omap-cpufreq.c | 4 | ||||
-rw-r--r-- | include/linux/cpufreq.h | 3 |
5 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index e7ddcb2b5261..a36a03d3c9a0 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c | |||
@@ -243,7 +243,6 @@ static int tegra_cpu_init(struct cpufreq_policy *policy) | |||
243 | /* FIXME: what's the actual transition time? */ | 243 | /* FIXME: what's the actual transition time? */ |
244 | policy->cpuinfo.transition_latency = 300 * 1000; | 244 | policy->cpuinfo.transition_latency = 300 * 1000; |
245 | 245 | ||
246 | policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; | ||
247 | cpumask_copy(policy->cpus, cpu_possible_mask); | 246 | cpumask_copy(policy->cpus, cpu_possible_mask); |
248 | 247 | ||
249 | if (policy->cpu == 0) | 248 | if (policy->cpu == 0) |
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index a108f66271ee..4e5b7fb8927c 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c | |||
@@ -146,7 +146,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) | |||
146 | * share the clock and voltage and clock. Use cpufreq affected_cpus | 146 | * share the clock and voltage and clock. Use cpufreq affected_cpus |
147 | * interface to have all CPUs scaled together. | 147 | * interface to have all CPUs scaled together. |
148 | */ | 148 | */ |
149 | policy->shared_type = CPUFREQ_SHARED_TYPE_ANY; | ||
150 | cpumask_setall(policy->cpus); | 149 | cpumask_setall(policy->cpus); |
151 | 150 | ||
152 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | 151 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); |
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/db8500-cpufreq.c index e12dff601b8a..79a84860ea56 100644 --- a/drivers/cpufreq/db8500-cpufreq.c +++ b/drivers/cpufreq/db8500-cpufreq.c | |||
@@ -130,8 +130,6 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy) | |||
130 | /* policy sharing between dual CPUs */ | 130 | /* policy sharing between dual CPUs */ |
131 | cpumask_setall(policy->cpus); | 131 | cpumask_setall(policy->cpus); |
132 | 132 | ||
133 | policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; | ||
134 | |||
135 | return 0; | 133 | return 0; |
136 | } | 134 | } |
137 | 135 | ||
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index 97102b05843f..9128c07bafba 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c | |||
@@ -214,10 +214,8 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) | |||
214 | * interface to handle this scenario. Additional is_smp() check | 214 | * interface to handle this scenario. Additional is_smp() check |
215 | * is to keep SMP_ON_UP build working. | 215 | * is to keep SMP_ON_UP build working. |
216 | */ | 216 | */ |
217 | if (is_smp()) { | 217 | if (is_smp()) |
218 | policy->shared_type = CPUFREQ_SHARED_TYPE_ANY; | ||
219 | cpumask_setall(policy->cpus); | 218 | cpumask_setall(policy->cpus); |
220 | } | ||
221 | 219 | ||
222 | /* FIXME: what's the actual transition time? */ | 220 | /* FIXME: what's the actual transition time? */ |
223 | policy->cpuinfo.transition_latency = 300 * 1000; | 221 | policy->cpuinfo.transition_latency = 300 * 1000; |
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 6bf3f2d12c90..a22944ca0526 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
@@ -93,7 +93,7 @@ struct cpufreq_policy { | |||
93 | cpumask_var_t cpus; /* Online CPUs only */ | 93 | cpumask_var_t cpus; /* Online CPUs only */ |
94 | cpumask_var_t related_cpus; /* Online + Offline CPUs */ | 94 | cpumask_var_t related_cpus; /* Online + Offline CPUs */ |
95 | 95 | ||
96 | unsigned int shared_type; /* ANY or ALL affected CPUs | 96 | unsigned int shared_type; /* ACPI: ANY or ALL affected CPUs |
97 | should set cpufreq */ | 97 | should set cpufreq */ |
98 | unsigned int cpu; /* cpu nr of CPU managing this policy */ | 98 | unsigned int cpu; /* cpu nr of CPU managing this policy */ |
99 | unsigned int last_cpu; /* cpu nr of previous CPU that managed | 99 | unsigned int last_cpu; /* cpu nr of previous CPU that managed |
@@ -122,6 +122,7 @@ struct cpufreq_policy { | |||
122 | #define CPUFREQ_START (3) | 122 | #define CPUFREQ_START (3) |
123 | #define CPUFREQ_UPDATE_POLICY_CPU (4) | 123 | #define CPUFREQ_UPDATE_POLICY_CPU (4) |
124 | 124 | ||
125 | /* Only for ACPI */ | ||
125 | #define CPUFREQ_SHARED_TYPE_NONE (0) /* None */ | 126 | #define CPUFREQ_SHARED_TYPE_NONE (0) /* None */ |
126 | #define CPUFREQ_SHARED_TYPE_HW (1) /* HW does needed coordination */ | 127 | #define CPUFREQ_SHARED_TYPE_HW (1) /* HW does needed coordination */ |
127 | #define CPUFREQ_SHARED_TYPE_ALL (2) /* All dependent CPUs should set freq */ | 128 | #define CPUFREQ_SHARED_TYPE_ALL (2) /* All dependent CPUs should set freq */ |