diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-07-10 21:23:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 05:00:55 -0400 |
| commit | be54f9d1c8df93c4998e134a306652caaa58f67f (patch) | |
| tree | 77cea9b5623518dc41cb9509fd6d933068da6945 /arch | |
| parent | b8b48326f312026af12799917383c54c25d05482 (diff) | |
x86: remove ifdef CONFIG_SWIOTLB in pci-dma.c
As other IOMMUs do, this puts dummy pci_swiotlb_init() in swiotlb.h
and remove ifdef CONFIG_SWIOTLB in pci-dma.c.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index f16cbbe424a1..d12945de0565 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -122,9 +122,7 @@ void __init pci_iommu_alloc(void) | |||
| 122 | 122 | ||
| 123 | amd_iommu_detect(); | 123 | amd_iommu_detect(); |
| 124 | 124 | ||
| 125 | #ifdef CONFIG_SWIOTLB | ||
| 126 | pci_swiotlb_init(); | 125 | pci_swiotlb_init(); |
| 127 | #endif | ||
| 128 | } | 126 | } |
| 129 | #endif | 127 | #endif |
| 130 | 128 | ||