git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
cbe_cpufreq.c
diff --git
a/arch/powerpc/platforms/cell/cbe_cpufreq.c
b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index
0b6e8ee
..
bfa2c0c
100644
(file)
--- a/
arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/
arch/powerpc/platforms/cell/cbe_cpufreq.c
@@
-21,10
+21,11
@@
*/
#include <linux/cpufreq.h>
*/
#include <linux/cpufreq.h>
+#include <linux/of_platform.h>
+
#include <asm/machdep.h>
#include <asm/machdep.h>
-#include <asm/of_platform.h>
#include <asm/prom.h>
#include <asm/prom.h>
-#include
"cbe_regs.h"
+#include
<asm/cell-regs.h>
#include "cbe_cpufreq.h"
static DEFINE_MUTEX(cbe_switch_mutex);
#include "cbe_cpufreq.h"
static DEFINE_MUTEX(cbe_switch_mutex);
@@
-107,8
+108,6
@@
static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
}
pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
}
- policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
-
/* if DEBUG is enabled set_pmode() measures the latency
* of a transition */
policy->cpuinfo.transition_latency = 25000;
/* if DEBUG is enabled set_pmode() measures the latency
* of a transition */
policy->cpuinfo.transition_latency = 25000;
@@
-119,7
+118,7
@@
static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cur = cbe_freqs[cur_pmode].frequency;
#ifdef CONFIG_SMP
policy->cur = cbe_freqs[cur_pmode].frequency;
#ifdef CONFIG_SMP
-
policy->cpus = cpu_sibling_map[policy->cpu]
;
+
cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu))
;
#endif
cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);
#endif
cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);