diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /arch/x86_64/kernel/pci-nommu.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/x86_64/kernel/pci-nommu.c')
| -rw-r--r-- | arch/x86_64/kernel/pci-nommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c index c4c3cc36ac5b..aad7609d8e92 100644 --- a/arch/x86_64/kernel/pci-nommu.c +++ b/arch/x86_64/kernel/pci-nommu.c | |||
| @@ -92,5 +92,7 @@ void __init no_iommu_init(void) | |||
| 92 | { | 92 | { |
| 93 | if (dma_ops) | 93 | if (dma_ops) |
| 94 | return; | 94 | return; |
| 95 | |||
| 96 | force_iommu = 0; /* no HW IOMMU */ | ||
| 95 | dma_ops = &nommu_dma_ops; | 97 | dma_ops = &nommu_dma_ops; |
| 96 | } | 98 | } |