projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git]
/
lib
/
iommu-common.c
diff --git
a/lib/iommu-common.c
b/lib/iommu-common.c
index
df30632
..
ff19f66
100644
(file)
--- a/
lib/iommu-common.c
+++ b/
lib/iommu-common.c
@@
-119,7
+119,7
@@
unsigned long iommu_tbl_range_alloc(struct device *dev,
unsigned long align_mask = 0;
if (align_order > 0)
- align_mask =
0xffffffffffffffffl >> (64
- align_order);
+ align_mask =
~0ul >> (BITS_PER_LONG
- align_order);
/* Sanity check */
if (unlikely(npages == 0)) {