From: Ingo Molnar Date: Fri, 7 Jan 2011 13:14:15 +0000 (+0100) Subject: Merge branch 'linus' into x86/apic-cleanups X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c2a48cf65580a276552151eb8f78d78c55b828e;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'linus' into x86/apic-cleanups Conflicts: arch/x86/include/asm/io_apic.h Merge reason: Resolve the conflict, update to a more recent -rc base Signed-off-by: Ingo Molnar --- 1c2a48cf65580a276552151eb8f78d78c55b828e diff --cc arch/x86/kernel/acpi/boot.c index 1a5b9a8e6c4,17c8090fabd..ec881c6bfee --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@@ -895,10 -912,10 +900,10 @@@ static int __init acpi_parse_madt_lapic return count; } - acpi_register_lapic_address(acpi_lapic_addr); + register_lapic_address(acpi_lapic_addr); count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC, - acpi_parse_sapic, MAX_APICS); + acpi_parse_sapic, MAX_LOCAL_APIC); if (!count) { x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC,