diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-29 17:14:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-29 17:14:18 -0400 |
| commit | 3ec8a773d2775db86cc21d28b77bea29c8a1ea3c (patch) | |
| tree | 6318ed9ec67651f182fb0f0c966ca7b5dd12ba35 /arch/ia64 | |
| parent | 95ecc5e5a3b20a3c76164d089c69051662e9d9b3 (diff) | |
| parent | e8579e72ca240f3fbaa669f09a9d610436505366 (diff) | |
Pull swiotlb-size into release branch
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/lib/swiotlb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index ab7b3ad99a7f..dbc0b3e449c5 100644 --- a/arch/ia64/lib/swiotlb.c +++ b/arch/ia64/lib/swiotlb.c | |||
| @@ -93,8 +93,7 @@ static int __init | |||
| 93 | setup_io_tlb_npages(char *str) | 93 | setup_io_tlb_npages(char *str) |
| 94 | { | 94 | { |
| 95 | if (isdigit(*str)) { | 95 | if (isdigit(*str)) { |
| 96 | io_tlb_nslabs = simple_strtoul(str, &str, 0) << | 96 | io_tlb_nslabs = simple_strtoul(str, &str, 0); |
| 97 | (PAGE_SHIFT - IO_TLB_SHIFT); | ||
| 98 | /* avoid tail segment of size < IO_TLB_SEGSIZE */ | 97 | /* avoid tail segment of size < IO_TLB_SEGSIZE */ |
| 99 | io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); | 98 | io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); |
| 100 | } | 99 | } |
| @@ -117,7 +116,7 @@ swiotlb_init_with_default_size (size_t default_size) | |||
| 117 | unsigned long i; | 116 | unsigned long i; |
| 118 | 117 | ||
| 119 | if (!io_tlb_nslabs) { | 118 | if (!io_tlb_nslabs) { |
| 120 | io_tlb_nslabs = (default_size >> PAGE_SHIFT); | 119 | io_tlb_nslabs = (default_size >> IO_TLB_SHIFT); |
| 121 | io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); | 120 | io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); |
| 122 | } | 121 | } |
| 123 | 122 | ||