openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Glauber de Oliveira Costa 2008-03-19 14:25:29 -03:00 committed by Ingo Molnar
parent 693d4b8a64
commit f68e00a32b
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/smpboot.c
View File

@ -114,7 +114,7 @@ void smp_checks(void)
* approved Athlon * approved Athlon
*/ */
if (tainted & TAINT_UNSAFE_SMP) { if (tainted & TAINT_UNSAFE_SMP) {
if (cpus_weight(cpu_present_map)) if (num_online_cpus())
printk(KERN_INFO "WARNING: This combination of AMD" printk(KERN_INFO "WARNING: This combination of AMD"
"processors is not suitable for SMP.\n"); "processors is not suitable for SMP.\n");
else else
@ -258,7 +258,7 @@ void impress_friends(void)
bogosum += cpu_data(cpu).loops_per_jiffy; bogosum += cpu_data(cpu).loops_per_jiffy;
printk(KERN_INFO printk(KERN_INFO
"Total of %d processors activated (%lu.%02lu BogoMIPS).\n", "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
cpus_weight(cpu_present_map), num_online_cpus(),
bogosum/(500000/HZ), bogosum/(500000/HZ),
(bogosum/(5000/HZ))%100); (bogosum/(5000/HZ))%100);

22
arch/x86/kernel/smpboot_32.c
View File

@ -788,8 +788,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
return 0; return 0;
} }
extern void impress_friends(void);
extern void smp_checks(void);
/* /*
* Cycle through the processors sending APIC IPIs to boot each. * Cycle through the processors sending APIC IPIs to boot each.
*/ */
@ -857,14 +855,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
++kicked; ++kicked;
} }
/*
* Cleanup possible dangling ends...
*/
smpboot_restore_warm_reset_vector();
impress_friends();
smp_checks();
/* /*
* construct cpu_sibling_map, so that we can tell sibling CPUs * construct cpu_sibling_map, so that we can tell sibling CPUs
* efficiently. * efficiently.
@ -959,8 +949,20 @@ int __cpuinit native_cpu_up(unsigned int cpu)
return 0; return 0;
} }
extern void impress_friends(void);
extern void smp_checks(void);
void __init native_smp_cpus_done(unsigned int max_cpus) void __init native_smp_cpus_done(unsigned int max_cpus)
{ {
/*
* Cleanup possible dangling ends...
*/
smpboot_restore_warm_reset_vector();
Dprintk("Boot done.\n");
impress_friends();
smp_checks();
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
setup_ioapic_dest(); setup_ioapic_dest();
#endif #endif

8
arch/x86/kernel/smpboot_64.c
View File

@ -824,12 +824,20 @@ int __cpuinit native_cpu_up(unsigned int cpu)
return err; return err;
} }
extern void impress_friends(void);
extern void smp_checks(void);
/* /*
* Finish the SMP boot. * Finish the SMP boot.
*/ */
void __init native_smp_cpus_done(unsigned int max_cpus) void __init native_smp_cpus_done(unsigned int max_cpus)
{ {
smp_cleanup_boot(); smp_cleanup_boot();
Dprintk("Boot done.\n");
impress_friends();
smp_checks();
setup_ioapic_dest(); setup_ioapic_dest();
check_nmi_watchdog(); check_nmi_watchdog();
} }