diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:13:32 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:13:32 -0400 |
| commit | 434f1d10c1adb6c2e333d501ce1e42be610e0723 (patch) | |
| tree | a43f1e6f40ea1530e648ae72709a2c45442891aa /include | |
| parent | 6070fe6f82c67021367092855c0812a98becf0fa (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include')
| -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 |