diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 15:52:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 15:52:44 -0400 |
commit | 361932bf84657b5dc0779046c751f06998c0d81f (patch) | |
tree | d39ea8018bd35db9701d343411865529d89255a9 /lib | |
parent | 90494cc567319cd53574306f3b94fb3c7ff8fe88 (diff) | |
parent | 5f98ecdbcef1920323d8777c0ba55dbd4335d3cf (diff) |
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.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 93ca08b8a45..99093b39614 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -110,6 +110,11 @@ setup_io_tlb_npages(char *str) | |||
110 | __setup("swiotlb=", setup_io_tlb_npages); | 110 | __setup("swiotlb=", setup_io_tlb_npages); |
111 | /* make io_tlb_overflow tunable too? */ | 111 | /* make io_tlb_overflow tunable too? */ |
112 | 112 | ||
113 | unsigned long swioltb_nr_tbl(void) | ||
114 | { | ||
115 | return io_tlb_nslabs; | ||
116 | } | ||
117 | |||
113 | /* Note that this doesn't work with highmem page */ | 118 | /* Note that this doesn't work with highmem page */ |
114 | static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev, | 119 | static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev, |
115 | volatile void *address) | 120 | volatile void *address) |