From 1dddf6914298ee2fcf9590f60239cf066730e68d Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 11 Aug 2011 16:50:56 -0400
Subject: [PATCH] --- yaml --- r: 282481 b: refs/heads/master c:
 f21ffe9f6da6d3a69c518b7345c198d48d941c34 h: refs/heads/master i:   282479:
 c311d0a5826425c05513a05daa5658ec20f1e07f v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/xen/swiotlb-xen.c | 2 +-
 trunk/include/linux/swiotlb.h   | 2 +-
 trunk/lib/swiotlb.c             | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a10d4796ed35..3b386a68600e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcdd6b2fd603340fbb0ed9984b32a9a066f1b806
+refs/heads/master: f21ffe9f6da6d3a69c518b7345c198d48d941c34
diff --git a/trunk/drivers/xen/swiotlb-xen.c b/trunk/drivers/xen/swiotlb-xen.c
index 8e964b91c447..4864e5d72e72 100644
--- a/trunk/drivers/xen/swiotlb-xen.c
+++ b/trunk/drivers/xen/swiotlb-xen.c
@@ -153,7 +153,7 @@ void __init xen_swiotlb_init(int verbose)
 	char *m = NULL;
 	unsigned int repeat = 3;
 
-	nr_tbl = swioltb_nr_tbl();
+	nr_tbl = swiotlb_nr_tbl();
 	if (nr_tbl)
 		xen_io_tlb_nslabs = nr_tbl;
 	else {
diff --git a/trunk/include/linux/swiotlb.h b/trunk/include/linux/swiotlb.h
index 445702c60d04..e872526fdc5f 100644
--- a/trunk/include/linux/swiotlb.h
+++ b/trunk/include/linux/swiotlb.h
@@ -24,7 +24,7 @@ extern int swiotlb_force;
 
 extern void swiotlb_init(int verbose);
 extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
-extern unsigned long swioltb_nr_tbl(void);
+extern unsigned long swiotlb_nr_tbl(void);
 
 /*
  * Enumeration for sync targets
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 99093b396145..058935ef3975 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/lib/swiotlb.c
@@ -110,11 +110,11 @@ setup_io_tlb_npages(char *str)
 __setup("swiotlb=", setup_io_tlb_npages);
 /* make io_tlb_overflow tunable too? */
 
-unsigned long swioltb_nr_tbl(void)
+unsigned long swiotlb_nr_tbl(void)
 {
 	return io_tlb_nslabs;
 }
-
+EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
 /* Note that this doesn't work with highmem page */
 static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
 				      volatile void *address)
@@ -321,6 +321,7 @@ void __init swiotlb_free(void)
 		free_bootmem_late(__pa(io_tlb_start),
 				  PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
 	}
+	io_tlb_nslabs = 0;
 }
 
 static int is_swiotlb_buffer(phys_addr_t paddr)