[PATCH 10/58] swiotlb: Prototype swiotlb_late_init_with_default_size in swiotlb.h

From: Josh Triplett
Date: Mon Nov 19 2012 - 00:29:11 EST


Several source files reference swiotlb_late_init_with_default_size with
an extern prototype; declare it in linux/swiotlb.h instead.

This also ensures that lib/swiotlb.c has a matching prototype for
swiotlb_late_init_with_default_size, keeping the types in sync, and
eliminating warnings from GCC (-Wmissing-prototypes) and Sparse
(-Wdecl).

lib/swiotlb.c:207:1: warning: no previous prototype for âswiotlb_late_init_with_default_sizeâ [-Wmissing-prototypes]

Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
---
arch/ia64/hp/common/sba_iommu.c | 3 +--
arch/x86/pci/sta2x11-fixup.c | 2 +-
include/linux/swiotlb.h | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index bcda5b2..d37d4af 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -38,6 +38,7 @@
#include <linux/iommu-helper.h>
#include <linux/dma-mapping.h>
#include <linux/prefetch.h>
+#include <linux/swiotlb.h>

#include <asm/delay.h> /* ia64_get_itc() */
#include <asm/io.h>
@@ -46,8 +47,6 @@

#include <asm/acpi-ext.h>

-extern int swiotlb_late_init_with_default_size (size_t size);
-
#define PFX "IOC: "

/*
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
index 9d8a509..27dde02 100644
--- a/arch/x86/pci/sta2x11-fixup.c
+++ b/arch/x86/pci/sta2x11-fixup.c
@@ -26,9 +26,9 @@
#include <linux/pci_ids.h>
#include <linux/export.h>
#include <linux/list.h>
+#include <linux/swiotlb.h>

#define STA2X11_SWIOTLB_SIZE (4*1024*1024)
-extern int swiotlb_late_init_with_default_size(size_t default_size);

/*
* We build a list of bus numbers that are under the ConneXt. The
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 8d08b3e..7e3b8c5 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -23,6 +23,7 @@ extern int swiotlb_force;
#define IO_TLB_SHIFT 11

extern void swiotlb_init(int verbose);
+extern int swiotlb_late_init_with_default_size(size_t default_size);
extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
extern unsigned long swiotlb_nr_tbl(void);
extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/