x86/apic changes for v4.12
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: 5ba039a55498d78a787edaf8cc915f29a17cecf3 x86/apic: Fix a comment in init_apic_mappings()
Two small cleanups.
Thanks,
Ingo
------------------>
Dou Liyang (2):
x86/apic: Remove the SET_APIC_ID(x) macro x86/apic: Fix a comment in init_apic_mappings()
arch/x86/include/asm/apic.h | 7 +------ arch/x86/kernel/apic/apic.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-)
arch/x86/include/asm/apic.h +1 -6
@@ -252,12 +252,6 @@ static inline int x2apic_enabled(void) { return 0; }#define x2apic_supported () (0)#endif /* !CONFIG_X86_X2APIC */ -#ifdef CONFIG_X86_64 -#define SET_APIC_ID (x) (apic->set_apic_id(x)) -#else - -#endif -/* * Copyright 2004 James Cleverdon, IBM. * Subject to the GNU Public License, v.2
@@ -299,6 +293,7 @@ struct apic {int (*phys_pkg_id)(int cpuid_apic,int index_msb);unsigned int (*get_apic_id)(unsigned long x); +/* Can't be NULL on 64-bit */ unsigned long (*set_apic_id)(unsigned int id); int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,
arch/x86/kernel/apic/apic.c +3 -3
@@ -1789,8 +1789,8 @@ void __init init_apic_mappings(void) apic_phys = mp_lapic_addr;/* -* acpi lapic path already maps that address in -* acpi_register_lapic_address() +* If the system has ACPI MADT tables or MP info, the LAPIC +* address is already registered. */ if (!acpi_lapic && !smp_found_config)register_lapic_address (apic_phys);
@@ -2249,7 +2249,7 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))static void __init apic_bsp_up_setup (void ) {#ifdef CONFIG_X86_64 -apic_write (APIC_ID ,SET_APIC_ID (boot_cpu_physical_apicid)); +apic_write (APIC_ID , apic->set_apic_id (boot_cpu_physical_apicid));#else /* * Hack: In case of kdump, after a crash, kernel might be booting