summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/iommu.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-11-14 13:47:31 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 11:37:16 -0800
commit52168e60f7d86d83124903098ac8c2dba93cd1c4 (patch)
tree349eea04ccb95c3495b7ac17d774966da142899f /arch/x86/include/asm/iommu.h
parent748f1a2ed7a68e15b28a1da3559afbebba121772 (diff)
Revert "x86: blacklist DMAR on Intel G31/G33 chipsets"
This reverts commit e51af6630848406fc97adbd71443818cdcda297b, which was wrongly hoovered up and submitted about a month after a better fix had already been merged. The better fix is commit cbda1ba898647aeb4ee770b803c922f595e97731 ("PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets"), where we do this blacklisting based on the DMI identification for the offending motherboard, since sometimes this chipset (or at least a chipset with the same PCI ID) apparently _does_ actually have an IOMMU. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/iommu.h')
-rw-r--r--arch/x86/include/asm/iommu.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
index e4a552d44465..0b500c5b6446 100644
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -6,7 +6,6 @@ extern void no_iommu_init(void);
extern struct dma_mapping_ops nommu_dma_ops;
extern int force_iommu, no_iommu;
extern int iommu_detected;
-extern int dmar_disabled;
extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);