lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: make APIC_init_uniprocessor() more like smp_prepare_cpus()

Browse Source 
Impact: cleanup

1. move localise_nmi_watchdog() later
2. change setup_boot_APIC_clock() to setup_boot_clock() for 64-bit

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2009-02-16 00:00:50 -08:00
committed by Ingo Molnar
parent 3bd25d0fa3
commit 98c061b6cf
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1649,32 +1649,28 @@ int __init APIC_init_uniprocessor(void)
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
/* /*
* Now enable IO-APICs, actually call clear_IO_APIC * Now enable IO-APICs, actually call clear_IO_APIC
* We need clear_IO_APIC before enabling vector on BP * We need clear_IO_APIC before enabling error vector
*/ */
if (!skip_ioapic_setup && nr_ioapics) if (!skip_ioapic_setup && nr_ioapics)
enable_IO_APIC(); enable_IO_APIC();
if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)
localise_nmi_watchdog();
#else
localise_nmi_watchdog();
#endif #endif
end_local_APIC_setup(); end_local_APIC_setup();
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
if (smp_found_config && !skip_ioapic_setup && nr_ioapics) if (smp_found_config && !skip_ioapic_setup && nr_ioapics)
setup_IO_APIC(); setup_IO_APIC();
# ifdef CONFIG_X86_64 else {
else
nr_ioapics = 0; nr_ioapics = 0;
# endif localise_nmi_watchdog();
}
#else
localise_nmi_watchdog();
#endif #endif
#ifdef CONFIG_X86_64
setup_boot_APIC_clock();
check_nmi_watchdog();
#else
setup_boot_clock(); setup_boot_clock();
#ifdef CONFIG_X86_64
check_nmi_watchdog();
#endif #endif
return 0; return 0;