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
powerpc: minor cleanups for mpc86xx
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
86xx
/
mpc86xx_smp.c
diff --git
a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index
944ec4b
..
9cca3d1
100644
(file)
--- a/
arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/
arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@
-34,8
+34,8
@@
extern unsigned long __secondary_hold_acknowledge;
static void __init
smp_86xx_release_core(int nr)
{
static void __init
smp_86xx_release_core(int nr)
{
-
void
*mcm_vaddr;
- unsigned long
vaddr,
pcr;
+
__be32 __iomem
*mcm_vaddr;
+ unsigned long pcr;
if (nr < 0 || nr >= NR_CPUS)
return;
if (nr < 0 || nr >= NR_CPUS)
return;
@@
-45,10
+45,9
@@
smp_86xx_release_core(int nr)
*/
mcm_vaddr = ioremap(get_immrbase() + MPC86xx_MCM_OFFSET,
MPC86xx_MCM_SIZE);
*/
mcm_vaddr = ioremap(get_immrbase() + MPC86xx_MCM_OFFSET,
MPC86xx_MCM_SIZE);
- vaddr = (unsigned long)mcm_vaddr + MCM_PORT_CONFIG_OFFSET;
- pcr = in_be32((volatile unsigned *)vaddr);
+ pcr = in_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2));
pcr |= 1 << (nr + 24);
pcr |= 1 << (nr + 24);
- out_be32(
(volatile unsigned *)vaddr
, pcr);
+ out_be32(
mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2)
, pcr);
}
}