diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2005-06-08 04:21:25 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2005-06-08 04:21:25 +0000 |
| commit | cc10120630755a4cbe40ddea21d658f1cbcb5f91 (patch) | |
| tree | d96721b22a8e141477e36c1a993a8bb8fc0c7533 /sys/arch | |
| parent | 224cc87767c724b4ba5bce68c7eb6bdc5b4d5566 (diff) | |
revert enabling iommu on amd64 as it breaks at least one MP host.
OK deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/pci/iommu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/amd64/pci/iommu.c b/sys/arch/amd64/pci/iommu.c index 86bc0dc935c..dd6544a6f3b 100644 --- a/sys/arch/amd64/pci/iommu.c +++ b/sys/arch/amd64/pci/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.11 2005/06/07 16:40:31 deraadt Exp $ */ +/* $OpenBSD: iommu.c,v 1.12 2005/06/08 04:21:24 marc Exp $ */ /* * Copyright (c) 2005 Jason L. Wright (jason@thought.net) @@ -110,6 +110,7 @@ extern paddr_t avail_end; extern struct extent *iomem_ex; int amdgarts; +int amdgart_enable; struct amdgart_softc { pci_chipset_tag_t g_pc; @@ -252,6 +253,9 @@ amdgart_probe(struct pcibus_attach_args *pba) u_int32_t *pte; paddr_t ptepa; + if (amdgart_enable == 0) + return; + TAILQ_INIT(&plist); for (count = 0, dev = 24; dev < 32; dev++) { |