diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-09-23 00:54:37 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-23 00:54:37 -0400 |
commit | f6ab9c68406dfcd1fcd0a5352244fcb932b113b1 (patch) | |
tree | 8a411992ed256859bfdca3a15b2335d0cbd065ee /arch | |
parent | 7c6f947f2477f7c0017be1af458eb5e0b96b7f40 (diff) |
ppc64 iSeries: Make smp_release_cpus() callable on iSeries
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc64/kernel/head.S | 6 | ||||
-rw-r--r-- | arch/ppc64/kernel/setup.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index 22a5ee07e1ea..b1d0edff0c04 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S | |||
@@ -1970,20 +1970,22 @@ _GLOBAL(hmt_start_secondary) | |||
1970 | blr | 1970 | blr |
1971 | #endif | 1971 | #endif |
1972 | 1972 | ||
1973 | #if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)) | 1973 | #if defined(CONFIG_KEXEC) || defined(CONFIG_SMP) |
1974 | _GLOBAL(smp_release_cpus) | 1974 | _GLOBAL(smp_release_cpus) |
1975 | /* All secondary cpus are spinning on a common | 1975 | /* All secondary cpus are spinning on a common |
1976 | * spinloop, release them all now so they can start | 1976 | * spinloop, release them all now so they can start |
1977 | * to spin on their individual paca spinloops. | 1977 | * to spin on their individual paca spinloops. |
1978 | * For non SMP kernels, the secondary cpus never | 1978 | * For non SMP kernels, the secondary cpus never |
1979 | * get out of the common spinloop. | 1979 | * get out of the common spinloop. |
1980 | * XXX This does nothing useful on iSeries, secondaries are | ||
1981 | * already waiting on their paca. | ||
1980 | */ | 1982 | */ |
1981 | li r3,1 | 1983 | li r3,1 |
1982 | LOADADDR(r5,__secondary_hold_spinloop) | 1984 | LOADADDR(r5,__secondary_hold_spinloop) |
1983 | std r3,0(r5) | 1985 | std r3,0(r5) |
1984 | sync | 1986 | sync |
1985 | blr | 1987 | blr |
1986 | #endif /* CONFIG_SMP && !CONFIG_PPC_ISERIES */ | 1988 | #endif /* CONFIG_SMP */ |
1987 | 1989 | ||
1988 | 1990 | ||
1989 | /* | 1991 | /* |
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index ca8acf671e46..acf826043e39 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -154,7 +154,7 @@ struct screen_info screen_info = { | |||
154 | .orig_video_points = 16 | 154 | .orig_video_points = 16 |
155 | }; | 155 | }; |
156 | 156 | ||
157 | #if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP) | 157 | #ifdef CONFIG_SMP |
158 | 158 | ||
159 | static int smt_enabled_cmdline; | 159 | static int smt_enabled_cmdline; |
160 | 160 | ||
@@ -307,7 +307,7 @@ static void __init setup_cpu_maps(void) | |||
307 | 307 | ||
308 | systemcfg->processorCount = num_present_cpus(); | 308 | systemcfg->processorCount = num_present_cpus(); |
309 | } | 309 | } |
310 | #endif /* defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP) */ | 310 | #endif /* CONFIG_SMP */ |
311 | 311 | ||
312 | 312 | ||
313 | #ifdef CONFIG_PPC_MULTIPLATFORM | 313 | #ifdef CONFIG_PPC_MULTIPLATFORM |
@@ -611,7 +611,7 @@ void __init setup_system(void) | |||
611 | parse_early_param(); | 611 | parse_early_param(); |
612 | #endif /* !CONFIG_PPC_ISERIES */ | 612 | #endif /* !CONFIG_PPC_ISERIES */ |
613 | 613 | ||
614 | #if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) | 614 | #ifdef CONFIG_SMP |
615 | /* | 615 | /* |
616 | * iSeries has already initialized the cpu maps at this point. | 616 | * iSeries has already initialized the cpu maps at this point. |
617 | */ | 617 | */ |
@@ -621,7 +621,7 @@ void __init setup_system(void) | |||
621 | * we can map physical -> logical CPU ids | 621 | * we can map physical -> logical CPU ids |
622 | */ | 622 | */ |
623 | smp_release_cpus(); | 623 | smp_release_cpus(); |
624 | #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */ | 624 | #endif |
625 | 625 | ||
626 | printk("Starting Linux PPC64 %s\n", system_utsname.version); | 626 | printk("Starting Linux PPC64 %s\n", system_utsname.version); |
627 | 627 | ||