From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Dec 2009 20:18:16 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: upstream/snapshot3+hdmi~16382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11bd04f6f35621193311c32e0721142b073a7794;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'linux-next' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
  PCI: fix coding style issue in pci_save_state()
  PCI: add pci_request_acs
  PCI: fix BUG_ON triggered by logical PCIe root port removal
  PCI: remove ifdefed pci_cleanup_aer_correct_error_status
  PCI: unconditionally clear AER uncorr status register during cleanup
  x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
  PCI: portdrv: remove redundant definitions
  PCI: portdrv: remove unnecessary struct pcie_port_data
  PCI: portdrv: minor cleanup for pcie_port_device_register
  PCI: portdrv: add missing irq cleanup
  PCI: portdrv: enable device before irq initialization
  PCI: portdrv: cleanup service irqs initialization
  PCI: portdrv: check capabilities first
  PCI: portdrv: move PME capability check
  PCI: portdrv: remove redundant pcie type calculation
  PCI: portdrv: cleanup pcie_device registration
  PCI: portdrv: remove redundant pcie_port_device_probe
  PCI: Always set prefetchable base/limit upper32 registers
  PCI: read-modify-write the pcie device control register when initiating pcie flr
  PCI: show dma_mask bits in /sys
  ...

Fixed up conflicts in:
	arch/x86/kernel/amd_iommu_init.c
	drivers/pci/dmar.c
	drivers/pci/hotplug/acpiphp_glue.c
---

11bd04f6f35621193311c32e0721142b073a7794
diff --cc arch/x86/kernel/amd_iommu_init.c
index 7ffc399,e60530a..9c4a6f7
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -1335,7 -1326,12 +1335,10 @@@ void __init amd_iommu_detect(void
  	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
  		iommu_detected = 1;
  		amd_iommu_detected = 1;
 -#ifdef CONFIG_GART_IOMMU
 -		gart_iommu_aperture_disabled = 1;
 -		gart_iommu_aperture = 0;
 -#endif
 +		x86_init.iommu.iommu_init = amd_iommu_init;
++
+ 		/* Make sure ACS will be enabled */
+ 		pci_request_acs();
  	}
  }
  
diff --cc drivers/pci/dmar.c
index 416f6ac,0e98f6b..6cdc931
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -645,13 -613,13 +645,16 @@@ void __init detect_intel_iommu(void
  			       "x2apic and Intr-remapping.\n");
  #endif
  #ifdef CONFIG_DMAR
- 		if (ret && !no_iommu && !iommu_detected && !dmar_disabled)
 -		if (ret && !no_iommu && !iommu_detected && !swiotlb &&
 -		    !dmar_disabled) {
++		if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
  			iommu_detected = 1;
+ 			/* Make sure ACS will be enabled */
+ 			pci_request_acs();
+ 		}
  #endif
 +#ifdef CONFIG_X86
 +		if (ret)
 +			x86_init.iommu.iommu_init = intel_iommu_init;
 +#endif
  	}
  	early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
  	dmar_tbl = NULL;