diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-13 16:23:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-13 16:23:11 -0700 |
| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd (patch) | |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 /lib | |
| parent | e8fed985d7bd6cda695e196028b54a5f3d2d91bb (diff) | |
| parent | 5b3e2e14eaa2a98232a4f292341fb88438685734 (diff) | |
| download | op-kernel-dev-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.zip op-kernel-dev-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cavium/Kconfig
The cavium conflict was overlapping dependency
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -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 df30632..ff19f66 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)) { |
