Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/acpi/processor_core.c between commit 9d48ea9f967b ("ACPI /
processor: Convert apic_id to phys_id to make it arch agnostic") from
the pm tree and commits 5922b6f497ed ("ACPI: Fix minor syntax issues in
processor_core.c") and 717ed6192d16 ("ACPI: Add interfaces to parse
IOAPIC ID for IOAPIC hotplug") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/acpi/processor_core.c
index 0f6f73ed41f2,f124cbb491d9..000000000000
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@@ -67,19 -86,12 +86,12 @@@ static int map_lsapic_id(struct acpi_su
  static int map_madt_entry(int type, u32 acpi_id)
  {
  	unsigned long madt_end, entry;
- 	static struct acpi_table_madt *madt;
- 	static int read_madt;
 -	int apic_id = -1;
 +	int phys_id = -1;	/* CPU hardware ID */
+ 	struct acpi_table_madt *madt;
  
- 	if (!read_madt) {
- 		if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
- 					(struct acpi_table_header **)&madt)))
- 			madt = NULL;
- 		read_madt++;
- 	}
- 
+ 	madt = get_madt_table();
  	if (!madt)
 -		return apic_id;
 +		return phys_id;
  
  	entry = (unsigned long)madt;
  	madt_end = entry + madt->header.length;
@@@ -125,13 -137,12 +137,12 @@@ static int map_mat_entry(acpi_handle ha
  	}
  
  	header = (struct acpi_subtable_header *)obj->buffer.pointer;
- 	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+ 	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)
 -		map_lapic_id(header, acpi_id, &apic_id);
 +		map_lapic_id(header, acpi_id, &phys_id);
- 	} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+ 	else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)
 -		map_lsapic_id(header, type, acpi_id, &apic_id);
 +		map_lsapic_id(header, type, acpi_id, &phys_id);
- 	} else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
+ 	else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)
 -		map_x2apic_id(header, type, acpi_id, &apic_id);
 +		map_x2apic_id(header, type, acpi_id, &phys_id);
- 	}
  
  exit:
  	kfree(buffer.pointer);
@@@ -197,10 -208,103 +208,103 @@@ int acpi_map_cpuid(int phys_id, u32 acp
  
  int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
  {
 -	int apic_id;
 +	int phys_id;
  
 -	apic_id = acpi_get_apicid(handle, type, acpi_id);
 +	phys_id = acpi_get_phys_id(handle, type, acpi_id);
  
 -	return acpi_map_cpuid(apic_id, acpi_id);
 +	return acpi_map_cpuid(phys_id, acpi_id);
  }
  EXPORT_SYMBOL_GPL(acpi_get_cpuid);
+ 
+ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
+ static int get_ioapic_id(struct acpi_subtable_header *entry, u32 gsi_base,
+ 			 u64 *phys_addr, int *ioapic_id)
+ {
+ 	struct acpi_madt_io_apic *ioapic = (struct acpi_madt_io_apic *)entry;
+ 
+ 	if (ioapic->global_irq_base != gsi_base)
+ 		return 0;
+ 
+ 	*phys_addr = ioapic->address;
+ 	*ioapic_id = ioapic->id;
+ 	return 1;
+ }
+ 
+ static int parse_madt_ioapic_entry(u32 gsi_base, u64 *phys_addr)
+ {
+ 	struct acpi_subtable_header *hdr;
+ 	unsigned long madt_end, entry;
+ 	struct acpi_table_madt *madt;
+ 	int apic_id = -1;
+ 
+ 	madt = get_madt_table();
+ 	if (!madt)
+ 		return apic_id;
+ 
+ 	entry = (unsigned long)madt;
+ 	madt_end = entry + madt->header.length;
+ 
+ 	/* Parse all entries looking for a match. */
+ 	entry += sizeof(struct acpi_table_madt);
+ 	while (entry + sizeof(struct acpi_subtable_header) < madt_end) {
+ 		hdr = (struct acpi_subtable_header *)entry;
+ 		if (hdr->type == ACPI_MADT_TYPE_IO_APIC &&
+ 		    get_ioapic_id(hdr, gsi_base, phys_addr, &apic_id))
+ 			break;
+ 		else
+ 			entry += hdr->length;
+ 	}
+ 
+ 	return apic_id;
+ }
+ 
+ static int parse_mat_ioapic_entry(acpi_handle handle, u32 gsi_base,
+ 				  u64 *phys_addr)
+ {
+ 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ 	struct acpi_subtable_header *header;
+ 	union acpi_object *obj;
+ 	int apic_id = -1;
+ 
+ 	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
+ 		goto exit;
+ 
+ 	if (!buffer.length || !buffer.pointer)
+ 		goto exit;
+ 
+ 	obj = buffer.pointer;
+ 	if (obj->type != ACPI_TYPE_BUFFER ||
+ 	    obj->buffer.length < sizeof(struct acpi_subtable_header))
+ 		goto exit;
+ 
+ 	header = (struct acpi_subtable_header *)obj->buffer.pointer;
+ 	if (header->type == ACPI_MADT_TYPE_IO_APIC)
+ 		get_ioapic_id(header, gsi_base, phys_addr, &apic_id);
+ 
+ exit:
+ 	kfree(buffer.pointer);
+ 	return apic_id;
+ }
+ 
+ /**
+  * acpi_get_ioapic_id - Get IOAPIC ID and physical address matching @gsi_base
+  * @handle:	ACPI object for IOAPIC device
+  * @gsi_base:	GSI base to match with
+  * @phys_addr:	Pointer to store physical address of matching IOAPIC record
+  *
+  * Walk resources returned by ACPI_MAT method, then ACPI MADT table, to search
+  * for an ACPI IOAPIC record matching @gsi_base.
+  * Return IOAPIC id and store physical address in @phys_addr if found a match,
+  * otherwise return <0.
+  */
+ int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr)
+ {
+ 	int apic_id;
+ 
+ 	apic_id = parse_mat_ioapic_entry(handle, gsi_base, phys_addr);
+ 	if (apic_id == -1)
+ 		apic_id = parse_madt_ioapic_entry(gsi_base, phys_addr);
+ 
+ 	return apic_id;
+ }
+ #endif /* CONFIG_ACPI_HOTPLUG_IOAPIC */