Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.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 ba55b0ff0f746a4c60dd848c06bfb41faa97d026..014e26cda08d1b08d012b174ed1b1908132f1b96 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -15,10 +15,11 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+#include <asm/code-patching.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
-#include <asm-powerpc/mpic.h>
+#include <asm/mpic.h>
 #include <asm/mpc86xx.h>
 #include <asm/cacheflush.h>
 
@@ -56,8 +57,7 @@ smp_86xx_kick_cpu(int nr)
        unsigned int save_vector;
        unsigned long target, flags;
        int n = 0;
-       volatile unsigned int *vector
-                = (volatile unsigned int *)(KERNELBASE + 0x100);
+       unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
 
        if (nr < 0 || nr >= NR_CPUS)
                return;
@@ -71,7 +71,7 @@ smp_86xx_kick_cpu(int nr)
 
        /* Setup fake reset vector to call __secondary_start_mpc86xx. */
        target = (unsigned long) __secondary_start_mpc86xx;
-       create_branch((unsigned long)vector, target, BRANCH_SET_LINK);
+       patch_branch(vector, target, BRANCH_SET_LINK);
 
        /* Kick that CPU */
        smp_86xx_release_core(nr);