linux-next: manual merge of the dwmw2-iommu tree with Linus' tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the dwmw2-iommu tree got a conflict in
arch/x86/kernel/apic/apic.c between commit 31dce14a3269 ("x86, ioapic:
Use ioapic_saved_data while enabling intr-remapping") from Linus' tree and
commit 6a87c5ec6463 ("intel-iommu: enable x2apic opt out") from the
dwmw2-iommu tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/kernel/apic/apic.c
index b961af8,fb1c36c..0000000
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -1461,16 -1450,24 +1461,17 @@@ int __init enable_IR(void
  void __init enable_IR_x2apic(void)
  {
  	unsigned long flags;
- 	int ret, x2apic_enabled = 0;
 -	struct IO_APIC_route_entry **ioapic_entries;
+ 	int ret = 0, x2apic_enabled = 0;
  	int dmar_table_init_ret;
  
  	dmar_table_init_ret = dmar_table_init();
- 	if (dmar_table_init_ret && !x2apic_supported())
+ 	if (dmar_table_init_ret && !cpu_has_x2apic)
  		return;
  
 -	ioapic_entries = alloc_ioapic_entries();
 -	if (!ioapic_entries) {
 -		pr_err("Allocate ioapic_entries failed\n");
 -		goto out;
 -	}
 -
 -	ret = save_IO_APIC_setup(ioapic_entries);
 +	ret = save_ioapic_entries();
  	if (ret) {
  		pr_info("Saving IO-APIC state failed: %d\n", ret);
+ 		ret = 0;
  		goto out;
  	}
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/