Merge branch 'for-paulus' of git://kernel/home/michael/src/work/

2 files changed, 0 insertions, 19 deletions

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 0b65efe1682e..db1cf397be2d 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -1914,24 +1914,6 @@ _GLOBAL(hmt_start_secondary)
         blr
 #endif
 
-#if defined(CONFIG_KEXEC) || defined(CONFIG_SMP)
-_GLOBAL(smp_release_cpus)
-        /* All secondary cpus are spinning on a common
-         * spinloop, release them all now so they can start
-         * to spin on their individual paca spinloops.
-         * For non SMP kernels, the secondary cpus never
-         * get out of the common spinloop.
-         * XXX This does nothing useful on iSeries, secondaries are
-         * already waiting on their paca.
-         */
-        li      r3,1
-        LOADADDR(r5,__secondary_hold_spinloop)
-        std     r3,0(r5)
-        sync
-        blr
-#endif /* CONFIG_SMP */
-
-
 /*
  * We put a few things here that have to be page-aligned.
  * This stuff goes at the beginning of the bss, which is page-aligned.
diff --git a/arch/ppc64/kernel/machine_kexec.c b/arch/ppc64/kernel/machine_kexec.c
index bf7cc4f8210f..ff8679f260f3 100644
--- a/arch/ppc64/kernel/machine_kexec.c
+++ b/arch/ppc64/kernel/machine_kexec.c
@@ -244,7 +244,6 @@ static void kexec_prepare_cpus(void)
 
 static void kexec_prepare_cpus(void)
 {
-        extern void smp_release_cpus(void);
         /*
          * move the secondarys to us so that we can copy
          * the new kernel 0-0x100 safely