diff options
author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2015-08-07 00:46:39 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-07 03:39:41 +0200 |
commit | 447f6a95a9c80da7faaec3e66e656eab8f262640 (patch) | |
tree | afaa0a4191056cf029161d5e45cbf30bae27d8e5 | |
parent | mm/slub: allow merging when SLAB_DEBUG_FREE is set (diff) | |
download | linux-447f6a95a9c80da7faaec3e66e656eab8f262640.tar.xz linux-447f6a95a9c80da7faaec3e66e656eab8f262640.zip |
lib/iommu-common.c: do not use 0xffffffffffffffffl for computing align_mask
Using a 64 bit constant generates "warning: integer constant is too
large for 'long' type" on 32 bit platforms. Instead use ~0ul and
BITS_PER_LONG.
Detected by Andrew Morton on ARMD.
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | lib/iommu-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iommu-common.c b/lib/iommu-common.c index df30632f0bef..ff19f66d3f7f 100644 --- 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)) { |