diff options
author | Mark Brown <broonie@kernel.org> | 2019-04-19 12:37:22 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-04-19 12:37:22 +0100 |
commit | 8fd8f8d65bf56aaa80c7ae5eaf26afd586139683 (patch) | |
tree | 8f9fd52a208936407fcba87b85c4445b38ee5eaa /arch/arm64/mm/init.c | |
parent | bf72d1505bc41ffd6b8d052e6da2f8fc535ed45a (diff) | |
parent | 58b454ebf81e5ae9391957d99cf89566d9eec1b1 (diff) |
Merge tag 'v4.14.112' into linux-linaro-lsk-v4.14linux-linaro-lsk-v4.14
This is the 4.14.112 stable release
Diffstat (limited to 'arch/arm64/mm/init.c')
-rw-r--r-- | arch/arm64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index caa295cd5d09..9e6c822d458d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -447,7 +447,7 @@ void __init arm64_memblock_init(void) * memory spans, randomize the linear region as well. */ if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) { - range = range / ARM64_MEMSTART_ALIGN + 1; + range /= ARM64_MEMSTART_ALIGN; memstart_addr -= ARM64_MEMSTART_ALIGN * ((range * memstart_offset_seed) >> 16); } |