diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:26:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:04 -0400 |
| commit | 83f7eb9c674c1bcaad6ca258fdd7dd3b96465a62 (patch) | |
| tree | edc24f8ee55d3bab0a35d7dc72da17a1137cf880 /arch/x86/kernel/smpboot_32.c | |
| parent | a8db8453ff52609b14716361651ad10d2ab66682 (diff) | |
x86: merge native_smp_cpus_done
They look similar enough, and are merged. Only difference
(zap_low_mapping for i386) is inside ifdef
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
| -rw-r--r-- | arch/x86/kernel/smpboot_32.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index 5d27b1db6c26..75fb5064af66 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
| @@ -215,24 +215,3 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
| 215 | mb(); | 215 | mb(); |
| 216 | smp_boot_cpus(max_cpus); | 216 | smp_boot_cpus(max_cpus); |
| 217 | } | 217 | } |
| 218 | |||
| 219 | extern void impress_friends(void); | ||
| 220 | extern void smp_checks(void); | ||
| 221 | |||
| 222 | void __init native_smp_cpus_done(unsigned int max_cpus) | ||
| 223 | { | ||
| 224 | /* | ||
| 225 | * Cleanup possible dangling ends... | ||
| 226 | */ | ||
| 227 | smpboot_restore_warm_reset_vector(); | ||
| 228 | |||
| 229 | Dprintk("Boot done.\n"); | ||
| 230 | |||
| 231 | impress_friends(); | ||
| 232 | smp_checks(); | ||
| 233 | #ifdef CONFIG_X86_IO_APIC | ||
| 234 | setup_ioapic_dest(); | ||
| 235 | #endif | ||
| 236 | check_nmi_watchdog(); | ||
| 237 | zap_low_mappings(); | ||
| 238 | } | ||