diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 4 | ||||
| -rw-r--r-- | drivers/parisc/sba_iommu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 60d338cd8009..62db3c3fe4dc 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
| @@ -366,8 +366,8 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size) | |||
| 366 | ** ggg sacrifices another 710 to the computer gods. | 366 | ** ggg sacrifices another 710 to the computer gods. |
| 367 | */ | 367 | */ |
| 368 | 368 | ||
| 369 | boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1, 1 << IOVP_SHIFT); | 369 | boundary_size = ALIGN((unsigned long long)dma_get_seg_boundary(dev) + 1, |
| 370 | boundary_size >>= IOVP_SHIFT; | 370 | 1ULL << IOVP_SHIFT) >> IOVP_SHIFT; |
| 371 | 371 | ||
| 372 | if (pages_needed <= 8) { | 372 | if (pages_needed <= 8) { |
| 373 | /* | 373 | /* |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index e834127a8505..bdbe780e21c5 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
| @@ -341,8 +341,8 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev, | |||
| 341 | unsigned long shift; | 341 | unsigned long shift; |
| 342 | int ret; | 342 | int ret; |
| 343 | 343 | ||
| 344 | boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1, 1 << IOVP_SHIFT); | 344 | boundary_size = ALIGN((unsigned long long)dma_get_seg_boundary(dev) + 1, |
| 345 | boundary_size >>= IOVP_SHIFT; | 345 | 1ULL << IOVP_SHIFT) >> IOVP_SHIFT; |
| 346 | 346 | ||
| 347 | #if defined(ZX1_SUPPORT) | 347 | #if defined(ZX1_SUPPORT) |
| 348 | BUG_ON(ioc->ibase & ~IOVP_MASK); | 348 | BUG_ON(ioc->ibase & ~IOVP_MASK); |