aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-11-11 10:03:28 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-11 10:51:18 -0500
commitb18485e7acfe1a634615d1c628ef644c0d58d472 (patch)
tree9b44e47b748f9377d88b960f8bdc6712b3c3046d /arch/x86/include/asm
parentb4941a9a606f0131559cc040b64e8437ac7b32c5 (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/include/asm')
-rw-r--r--arch/x86/include/asm/swiotlb.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h
index b9e4e20174fb..940f13a213f8 100644
--- a/arch/x86/include/asm/swiotlb.h
+++ b/arch/x86/include/asm/swiotlb.h
@@ -9,11 +9,12 @@ extern int swiotlb_force;
9 9
10#ifdef CONFIG_SWIOTLB 10#ifdef CONFIG_SWIOTLB
11extern int swiotlb; 11extern int swiotlb;
12extern void pci_swiotlb_init(void); 12extern int pci_swiotlb_init(void);
13#else 13#else
14#define swiotlb 0 14#define swiotlb 0
15static inline void pci_swiotlb_init(void) 15static inline int pci_swiotlb_init(void)
16{ 16{
17 return 0;
17} 18}
18#endif 19#endif
19 20