From fdf64831f677154a05bf4cd99ac0660d312b2b36 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 26 Aug 2009 12:10:19 +0200 Subject: [PATCH] --- yaml --- r: 158065 b: refs/heads/master c: f2430bd104bec2706315e9e983a9d9f828ff9565 h: refs/heads/master i: 158063: e615db854bd74a220c0e931f82997712150e5784 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 1 + trunk/arch/x86/kernel/amd_iommu.c | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0210c6e7f568..1ee830327ba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ac162d6c01ac7626f46c68c0770556cf682ce34 +refs/heads/master: f2430bd104bec2706315e9e983a9d9f828ff9565 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 1d9c18aa17eb..13ffa5df37d7 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -586,6 +586,7 @@ config GART_IOMMU bool "GART IOMMU support" if EMBEDDED default y select SWIOTLB + select AGP depends on X86_64 && PCI ---help--- Support for full DMA access of devices with 32bit memory access only diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c index 6c99f5037801..70fdef54e066 100644 --- a/trunk/arch/x86/kernel/amd_iommu.c +++ b/trunk/arch/x86/kernel/amd_iommu.c @@ -41,9 +41,7 @@ static DEFINE_RWLOCK(amd_iommu_devtable_lock); static LIST_HEAD(iommu_pd_list); static DEFINE_SPINLOCK(iommu_pd_list_lock); -#ifdef CONFIG_IOMMU_API static struct iommu_ops amd_iommu_ops; -#endif /* * general struct to manage commands send to an IOMMU @@ -62,10 +60,6 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom, unsigned long start_page, unsigned int pages); -#ifndef BUS_NOTIFY_UNBOUND_DRIVER -#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005 -#endif - #ifdef CONFIG_AMD_IOMMU_STATS /*