diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-04 16:17:32 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-04 16:17:32 +1100 |
| commit | 292a6c58e9133b57d004d92a846fff326dd31e92 (patch) | |
| tree | a267d1881a9a0bcb69938becd0c182874cd6c19c /arch/ppc64 | |
| parent | 8ad200d7b7c8fac77cf705831e90e889360d7030 (diff) | |
| parent | dc3a9efb5ee89493a42c3365d219e339e4720c2b (diff) | |
| download | linux-3.10-292a6c58e9133b57d004d92a846fff326dd31e92.tar.gz linux-3.10-292a6c58e9133b57d004d92a846fff326dd31e92.tar.bz2 linux-3.10-292a6c58e9133b57d004d92a846fff326dd31e92.zip | |
Merge branch 'for-paulus' of git://kernel/home/michael/src/work/
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/kernel/head.S | 18 | ||||
| -rw-r--r-- | arch/ppc64/kernel/machine_kexec.c | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index 0b65efe1682..db1cf397be2 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 bf7cc4f8210..ff8679f260f 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 |