diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-11-11 10:03:28 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-11 10:51:18 -0500 |
commit | b18485e7acfe1a634615d1c628ef644c0d58d472 (patch) | |
tree | 9b44e47b748f9377d88b960f8bdc6712b3c3046d /arch/x86/kernel/pci-dma.c | |
parent | b4941a9a606f0131559cc040b64e8437ac7b32c5 (diff) |
swiotlb: Remove the swiotlb variable usage
POWERPC doesn't expect it to be used.
This fixes the linux-next build failure reported by
Stephen Rothwell:
lib/swiotlb.c: In function 'setup_io_tlb_npages':
lib/swiotlb.c:114: error: 'swiotlb' undeclared (first use in this function)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: peterz@infradead.org
LKML-Reference: <20091112000258F.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index f79870e89266..0b11bf18f540 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -125,16 +125,13 @@ static void __init dma32_free_bootmem(void) | |||
125 | 125 | ||
126 | void __init pci_iommu_alloc(void) | 126 | void __init pci_iommu_alloc(void) |
127 | { | 127 | { |
128 | /* swiotlb is forced by the boot option */ | ||
129 | int use_swiotlb = swiotlb; | ||
130 | #ifdef CONFIG_X86_64 | 128 | #ifdef CONFIG_X86_64 |
131 | /* free the range so iommu could get some range less than 4G */ | 129 | /* free the range so iommu could get some range less than 4G */ |
132 | dma32_free_bootmem(); | 130 | dma32_free_bootmem(); |
133 | #else | 131 | #else |
134 | dma_ops = &nommu_dma_ops; | 132 | dma_ops = &nommu_dma_ops; |
135 | #endif | 133 | #endif |
136 | pci_swiotlb_init(); | 134 | if (pci_swiotlb_init()) |
137 | if (use_swiotlb) | ||
138 | return; | 135 | return; |
139 | 136 | ||
140 | gart_iommu_hole_init(); | 137 | gart_iommu_hole_init(); |