From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 7 Jan 2011 13:14:15 +0000 (+0100)
Subject: Merge branch 'linus' into x86/apic-cleanups
X-Git-Tag: firefly_0821_release~7613^2~3104^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1c2a48cf65580a276552151eb8f78d78c55b828e;p=firefly-linux-kernel-4.4.55.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 <mingo@elte.hu>
---

1c2a48cf65580a276552151eb8f78d78c55b828e
diff --cc arch/x86/kernel/acpi/boot.c
index 1a5b9a8e6c4f,17c8090fabd4..ec881c6bfee0
--- 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,