diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/lib/swiotlb.c | 5 | ||||
-rw-r--r-- | arch/ia64/pci/pci.c | 1 |
2 files changed, 3 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 | ||
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0addeca5570e..9977c122e9fa 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -379,6 +379,7 @@ void pcibios_bus_to_resource(struct pci_dev *dev, | |||
379 | res->start = region->start + offset; | 379 | res->start = region->start + offset; |
380 | res->end = region->end + offset; | 380 | res->end = region->end + offset; |
381 | } | 381 | } |
382 | EXPORT_SYMBOL(pcibios_bus_to_resource); | ||
382 | 383 | ||
383 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | 384 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) |
384 | { | 385 | { |