From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 21:23:48 +0000 (-0700)
Subject: Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~190
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=157b6ceb13e4b4148ee03dd517dbe88748943125;p=linux.git

Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, iommu: Update header comments with appropriate naming
  ia64, iommu: Add a dummy iommu_table.h file in IA64.
  x86, iommu: Fix IOMMU_INIT alignment rules
  x86, doc: Adding comments about .iommu_table and its neighbors.
  x86, iommu: Utilize the IOMMU_INIT macros functionality.
  x86, VT-d: Make Intel VT-d IOMMU use IOMMU_INIT_* macros.
  x86, GART/AMD-VI: Make AMD GART and IOMMU use IOMMU_INIT_* macros.
  x86, calgary: Make Calgary IOMMU use IOMMU_INIT_* macros.
  x86, xen-swiotlb: Make Xen-SWIOTLB use IOMMU_INIT_* macros.
  x86, swiotlb: Make SWIOTLB use IOMMU_INIT_* macros.
  x86, swiotlb: Simplify SWIOTLB pci_swiotlb_detect routine.
  x86, iommu: Add proper dependency sort routine (and sanity check).
  x86, iommu: Make all IOMMU's detection routines return a value.
  x86, iommu: Add IOMMU_INIT macros, .iommu_table section, and iommu_table_entry structure
---

157b6ceb13e4b4148ee03dd517dbe88748943125
diff --cc arch/x86/kernel/pci-gart_64.c
index c562207b1b3d,de9734b100a4..ba0f0ca9f280
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@@ -39,8 -39,9 +39,9 @@@
  #include <asm/cacheflush.h>
  #include <asm/swiotlb.h>
  #include <asm/dma.h>
 -#include <asm/k8.h>
 +#include <asm/amd_nb.h>
  #include <asm/x86_init.h>
+ #include <asm/iommu_table.h>
  
  static unsigned long iommu_bus_base;	/* GART remapping area (physical) */
  static unsigned long iommu_size;	/* size of remapping area bytes */