x86: make APIC_init_uniprocessor() more like smp_prepare_cpus()
PATCH 1/1 x86: make APIC_init_uniprocessor() more like smp_prepare_cpus()
Impact: cleanup
1. move localise_nmi_watchdgoe() later
2. change setup_boot_APIC_clock to setup_boot_clock for 64bit
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
arch/x86/kernel/apic.c +8 -12
@@ -1656,32 +1656,28 @@ int __init APIC_init_uniprocessor(void)#ifdef CONFIG_X86_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)enable_IO_APIC (); - -if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) -localise_nmi_watchdog (); -#else -localise_nmi_watchdog ();#endif +end_local_APIC_setup ();#ifdef CONFIG_X86_IO_APIC if (smp_found_config && !skip_ioapic_setup && nr_ioapics)setup_IO_APIC (); -# ifdef CONFIG_X86_64 - else +else { nr_ioapics =0 ; -# endif +localise_nmi_watchdog (); + } +#else +localise_nmi_watchdog ();#endif +setup_boot_clock ();#ifdef CONFIG_X86_64 -setup_boot_APIC_clock ();check_nmi_watchdog (); -#else -setup_boot_clock ();#endif return 0 ;
Ingo Molnar
AppliedQuoted 9 lines · Yinghai Lu
Impact: cleanup
1. move
localise_nmi_watchdgoe()later
2. changesetup_boot_APIC_clocktosetup_boot_clockfor 64bitSigned-off-by Yinghai Lu <[email protected]>--- arch/x86/kernel/apic.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
Applied to tip:x86/apic, thanks Yinghai!
Ingo