diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-11-14 20:46:38 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:03:10 +0100 |
| commit | 6959450e567c1f17d3ce8489099fc56c3721d577 (patch) | |
| tree | 603c327a7b8e246cea3e51ab87ac11660c309060 | |
| parent | 94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a (diff) | |
| download | blackbird-op-linux-6959450e567c1f17d3ce8489099fc56c3721d577.tar.gz blackbird-op-linux-6959450e567c1f17d3ce8489099fc56c3721d577.zip | |
swiotlb: Remove duplicate swiotlb_force extern declarations
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: tony.luck@intel.com
LKML-Reference: <1258199198-16657-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/ia64/include/asm/swiotlb.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/swiotlb.h | 4 | ||||
| -rw-r--r-- | include/linux/swiotlb.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h index dcbaea7ce128..f0acde68aaea 100644 --- a/arch/ia64/include/asm/swiotlb.h +++ b/arch/ia64/include/asm/swiotlb.h @@ -4,8 +4,6 @@ #include <linux/dma-mapping.h> #include <linux/swiotlb.h> -extern int swiotlb_force; - #ifdef CONFIG_SWIOTLB extern int swiotlb; extern void pci_swiotlb_init(void); diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h index 940f13a213f8..87ffcb12a1b8 100644 --- a/arch/x86/include/asm/swiotlb.h +++ b/arch/x86/include/asm/swiotlb.h @@ -3,10 +3,6 @@ #include <linux/swiotlb.h> -/* SWIOTLB interface */ - -extern int swiotlb_force; - #ifdef CONFIG_SWIOTLB extern int swiotlb; extern int pci_swiotlb_init(void); diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index eb9bdb4d4854..febedcf67c7e 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -7,6 +7,8 @@ struct device; struct dma_attrs; struct scatterlist; +extern int swiotlb_force; + /* * Maximum allowable number of contiguous slabs to map, * must be a power of 2. What is the appropriate value ? |
