diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:56:43 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:56:43 -0400 |
commit | cb650116a030dd5cf12f30651e29ceb990d42e4a (patch) | |
tree | 6cac1c4ea615d1a3893f82a4c950623b38421872 /include/asm-x86_64/pci.h | |
parent | 7bbaa75452c77cbaa016b987765c5d6c8b744587 (diff) | |
parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) |
Merge branch 'master'
Diffstat (limited to 'include/asm-x86_64/pci.h')
-rw-r--r-- | include/asm-x86_64/pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 5a82a6762c2..eeb3088a1c9 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h @@ -50,10 +50,10 @@ extern int iommu_setup(char *opt); * address space. The networking and block device layers use * this boolean for bounce buffer decisions * - * On x86-64 it mostly equals, but we set it to zero to tell some subsystems - * that an hard or soft IOMMU is available. + * On AMD64 it mostly equals, but we set it to zero to tell some subsystems + * that an IOMMU is available. */ -#define PCI_DMA_BUS_IS_PHYS 0 +#define PCI_DMA_BUS_IS_PHYS (no_iommu ? 1 : 0) /* * x86-64 always supports DAC, but sometimes it is useful to force |