diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:01 -0400 |
commit | f68e00a32b4f5a2881c3a39d71cc2c22e92f1d99 (patch) | |
tree | 5cf8e7cc674b388c15d211b0433313ffb0f9000e /arch/x86/kernel/smpboot_32.c | |
parent | 693d4b8a6429af7f2029df20a59e22f4d752e141 (diff) |
x86: move impress_friends and smp_check to cpus_done
the cpu count is changed accordingly: now, what matters is
online cpus.
Also, we add those functions for x86_64
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 | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index 361851cdaa97..1736404c3c36 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -788,8 +788,6 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
788 | return 0; | 788 | return 0; |
789 | } | 789 | } |
790 | 790 | ||
791 | extern void impress_friends(void); | ||
792 | extern void smp_checks(void); | ||
793 | /* | 791 | /* |
794 | * Cycle through the processors sending APIC IPIs to boot each. | 792 | * Cycle through the processors sending APIC IPIs to boot each. |
795 | */ | 793 | */ |
@@ -858,14 +856,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus) | |||
858 | } | 856 | } |
859 | 857 | ||
860 | /* | 858 | /* |
861 | * Cleanup possible dangling ends... | ||
862 | */ | ||
863 | smpboot_restore_warm_reset_vector(); | ||
864 | |||
865 | impress_friends(); | ||
866 | |||
867 | smp_checks(); | ||
868 | /* | ||
869 | * construct cpu_sibling_map, so that we can tell sibling CPUs | 859 | * construct cpu_sibling_map, so that we can tell sibling CPUs |
870 | * efficiently. | 860 | * efficiently. |
871 | */ | 861 | */ |
@@ -959,8 +949,20 @@ int __cpuinit native_cpu_up(unsigned int cpu) | |||
959 | return 0; | 949 | return 0; |
960 | } | 950 | } |
961 | 951 | ||
952 | extern void impress_friends(void); | ||
953 | extern void smp_checks(void); | ||
954 | |||
962 | void __init native_smp_cpus_done(unsigned int max_cpus) | 955 | void __init native_smp_cpus_done(unsigned int max_cpus) |
963 | { | 956 | { |
957 | /* | ||
958 | * Cleanup possible dangling ends... | ||
959 | */ | ||
960 | smpboot_restore_warm_reset_vector(); | ||
961 | |||
962 | Dprintk("Boot done.\n"); | ||
963 | |||
964 | impress_friends(); | ||
965 | smp_checks(); | ||
964 | #ifdef CONFIG_X86_IO_APIC | 966 | #ifdef CONFIG_X86_IO_APIC |
965 | setup_ioapic_dest(); | 967 | setup_ioapic_dest(); |
966 | #endif | 968 | #endif |