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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/swiotlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 8c0e349f4a6..445702c60d0 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h | |||
| @@ -24,6 +24,7 @@ extern int swiotlb_force; | |||
| 24 | 24 | ||
| 25 | extern void swiotlb_init(int verbose); | 25 | extern void swiotlb_init(int verbose); |
| 26 | extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); | 26 | extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); |
| 27 | extern unsigned long swioltb_nr_tbl(void); | ||
| 27 | 28 | ||
| 28 | /* | 29 | /* |
| 29 | * Enumeration for sync targets | 30 | * Enumeration for sync targets |