diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-12 20:09:27 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-12 20:09:27 +0300 |
commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /lib/iommu-common.c | |
parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
download | linux-79828b4fa835f73cdaf4bffa48696abdcbea9d02.tar.xz |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'lib/iommu-common.c')
-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)) { |