summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 12:52:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 12:52:44 -0700
commit361932bf84657b5dc0779046c751f06998c0d81f (patch)
treed39ea8018bd35db9701d343411865529d89255a9 /lib
parent90494cc567319cd53574306f3b94fb3c7ff8fe88 (diff)
parent5f98ecdbcef1920323d8777c0ba55dbd4335d3cf (diff)
downloadop-kernel-dev-361932bf84657b5dc0779046c751f06998c0d81f.zip
op-kernel-dev-361932bf84657b5dc0779046c751f06998c0d81f.tar.gz
Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6
* 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6: swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.
Diffstat (limited to 'lib')
-rw-r--r--lib/swiotlb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 93ca08b..99093b3 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -110,6 +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)
+{
+ return io_tlb_nslabs;
+}
+
/* Note that this doesn't work with highmem page */
static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
volatile void *address)
OpenPOWER on IntegriCloud