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 /drivers/xen | |
| 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 'drivers/xen')
| -rw-r--r-- | drivers/xen/swiotlb-xen.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 65ea21a97492..6e8c15a23201 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
| @@ -147,9 +147,15 @@ void __init xen_swiotlb_init(int verbose) | |||
| 147 | { | 147 | { |
| 148 | unsigned long bytes; | 148 | unsigned long bytes; |
| 149 | int rc; | 149 | int rc; |
| 150 | 150 | unsigned long nr_tbl; | |
| 151 | xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT); | 151 | |
| 152 | xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE); | 152 | nr_tbl = swioltb_nr_tbl(); |
| 153 | if (nr_tbl) | ||
| 154 | xen_io_tlb_nslabs = nr_tbl; | ||
| 155 | else { | ||
| 156 | xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT); | ||
| 157 | xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE); | ||
| 158 | } | ||
| 153 | 159 | ||
| 154 | bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; | 160 | bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; |
| 155 | 161 | ||