summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/smp.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-30 05:19:31 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-30 05:19:31 +0100
commitdece8ada993e1764a115bdff0f1effffaa5fc8dc (patch)
treeba35b26bce046c3062bf13b2fd7611cf9265e66e /arch/powerpc/kernel/smp.c
parentpowerpc: Fix endian issues in power7/8 machine check handler (diff)
parentMerge remote-tracking branch 'agust/merge' into merge (diff)
downloadlinux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.tar.xz
linux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.zip
Merge branch 'merge' into next
Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such as Anton Little Endian fixes. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
-rw-r--r--arch/powerpc/kernel/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 19d654b0150a..ac2621af3154 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -575,7 +575,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
int cpu_to_core_id(int cpu)
{
struct device_node *np;
- const int *reg;
+ const __be32 *reg;
int id = -1;
np = of_get_cpu_node(cpu, NULL);
@@ -586,7 +586,7 @@ int cpu_to_core_id(int cpu)
if (!reg)
goto out;
- id = *reg;
+ id = be32_to_cpup(reg);
out:
of_node_put(np);
return id;