evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ppc64 iSeries: Make smp_release_cpus() callable on iSeries

Browse source 
We don't need to call smp_release_cpus() on iSeries but it's harmless
if we do and it removes another #ifdef ISERIES.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Michael Ellerman 2005-09-23 14:54:37 +10:00 • committed by Stephen Rothwell
parent 7c6f947f24
commit f6ab9c6840
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/ppc64/kernel/head.S
View file

@ -1970,20 +1970,22 @@ _GLOBAL(hmt_start_secondary)
blr blr
#endif #endif
#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)) #if defined(CONFIG_KEXEC) || defined(CONFIG_SMP)
_GLOBAL(smp_release_cpus) _GLOBAL(smp_release_cpus)
/* All secondary cpus are spinning on a common /* All secondary cpus are spinning on a common
* spinloop, release them all now so they can start * spinloop, release them all now so they can start
* to spin on their individual paca spinloops. * to spin on their individual paca spinloops.
* For non SMP kernels, the secondary cpus never * For non SMP kernels, the secondary cpus never
* get out of the common spinloop. * get out of the common spinloop.
* XXX This does nothing useful on iSeries, secondaries are
* already waiting on their paca.
*/ */
li r3,1 li r3,1
LOADADDR(r5,__secondary_hold_spinloop) LOADADDR(r5,__secondary_hold_spinloop)
std r3,0(r5) std r3,0(r5)
sync sync
blr blr
#endif /* CONFIG_SMP && !CONFIG_PPC_ISERIES */ #endif /* CONFIG_SMP */
/* /*

8
arch/ppc64/kernel/setup.c
View file

@ -154,7 +154,7 @@ struct screen_info screen_info = {
.orig_video_points = 16 .orig_video_points = 16
}; };
#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP) #ifdef CONFIG_SMP
static int smt_enabled_cmdline; static int smt_enabled_cmdline;
@ -307,7 +307,7 @@ static void __init setup_cpu_maps(void)
systemcfg->processorCount = num_present_cpus(); systemcfg->processorCount = num_present_cpus();
} }
#endif /* defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP) */ #endif /* CONFIG_SMP */
#ifdef CONFIG_PPC_MULTIPLATFORM #ifdef CONFIG_PPC_MULTIPLATFORM
@ -611,7 +611,7 @@ void __init setup_system(void)
parse_early_param(); parse_early_param();
#endif /* !CONFIG_PPC_ISERIES */ #endif /* !CONFIG_PPC_ISERIES */
#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) #ifdef CONFIG_SMP
/* /*
* iSeries has already initialized the cpu maps at this point. * iSeries has already initialized the cpu maps at this point.
*/ */
@ -621,7 +621,7 @@ void __init setup_system(void)
* we can map physical -> logical CPU ids * we can map physical -> logical CPU ids
*/ */
smp_release_cpus(); smp_release_cpus();
#endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */ #endif
printk("Starting Linux PPC64 %s\n", system_utsname.version); printk("Starting Linux PPC64 %s\n", system_utsname.version);