diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /arch/x86_64/kernel/pci-nommu.c | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
Merge branch 'upstream-fixes' into upstream
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 | } |