From 5c315a0773e57b7078a0df1d30e1d3b227fe41f6 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 20 Nov 2008 20:49:56 +0100 Subject: [PATCH] --- yaml --- r: 119412 b: refs/heads/master c: b627c8b17ccacba38c975bc0f69a49fc4e5261c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/pci_64.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 62e703e0414c..78f0267f3379 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffd565a8b817d1eb4b25184e8418e8d96c3f56f6 +refs/heads/master: b627c8b17ccacba38c975bc0f69a49fc4e5261c9 diff --git a/trunk/arch/x86/include/asm/pci_64.h b/trunk/arch/x86/include/asm/pci_64.h index 5b28995d664e..d02d936840a3 100644 --- a/trunk/arch/x86/include/asm/pci_64.h +++ b/trunk/arch/x86/include/asm/pci_64.h @@ -34,8 +34,6 @@ extern void pci_iommu_alloc(void); */ #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) -#if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU) - #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ dma_addr_t ADDR_NAME; #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ @@ -49,18 +47,6 @@ extern void pci_iommu_alloc(void); #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ (((PTR)->LEN_NAME) = (VAL)) -#else -/* No IOMMU */ - -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) -#define pci_unmap_addr(PTR, ADDR_NAME) (0) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define pci_unmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) - -#endif - #endif /* __KERNEL__ */ #endif /* _ASM_X86_PCI_64_H */