]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Revert "x86: blacklist DMAR on Intel G31/G33 chipsets"
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 14 Nov 2008 13:47:31 +0000 (13:47 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2008 19:37:16 +0000 (11:37 -0800)
commit52168e60f7d86d83124903098ac8c2dba93cd1c4
tree349eea04ccb95c3495b7ac17d774966da142899f
parent748f1a2ed7a68e15b28a1da3559afbebba121772
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>
arch/x86/include/asm/iommu.h
arch/x86/kernel/early-quirks.c