summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorJon Mason <jdmason@us.ibm.com>2006-02-26 04:18:22 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-26 09:53:29 -0800
commit60b08c67220cf6faef7410ac6adba23a8a743bf7 (patch)
treead3c5f6933f06ce46ff41b0fe456a10900a04567 /include/asm-x86_64
parent04a3d311c01d3ad287750c5c8d03fa614475af91 (diff)
downloadblackbird-op-linux-60b08c67220cf6faef7410ac6adba23a8a743bf7.tar.gz
blackbird-op-linux-60b08c67220cf6faef7410ac6adba23a8a743bf7.zip
[PATCH] x86_64: no_iommu removal in pci-gart.c
In previous versions of pci-gart.c, no_iommu was used to determine if IOMMU was disabled in the GART DMA mapping functions. This changed in 2.6.16 and now gart_xxx() functions are only called if gart is enabled. Therefore, uses of no_iommu in the GART code are no longer necessary and can be removed. Also, it removes double deceleration of no_iommu and force_iommu in pci.h and proto.h, by removing the deceleration in pci.h. Lastly, end_pfn off by one error. Tested (along with patch 1/2) on dual opteron with gart enabled, iommu=soft, and iommu=off. Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index fd03e15d7ea6..8a05af264d18 100644
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
@@ -19,8 +19,6 @@ extern unsigned int pcibios_assign_all_busses(void);
#endif
#define pcibios_scan_all_fns(a, b) 0
-extern int no_iommu, force_iommu;
-
extern unsigned long pci_mem_start;
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM (pci_mem_start)
OpenPOWER on IntegriCloud