From c5239ad59716a833a15523755b03418a47e02a5a Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Thu, 11 Jan 2018 15:04:19 +0100 Subject: vabits - subtract from the 'end' address instead of from 'bits'. This is a fixup for the commits on calc base address on AArch64 based on autodetected VA space size As reported by: Brian Brooks Signed-off-by: Gabriel Ganne Change-Id: Id1bd7b7d7e5c188d8547c46134082bd4563b92db --- src/svm/svm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/svm/svm.c b/src/svm/svm.c index 2cbc0d77c22..d3e56c1a46a 100644 --- a/src/svm/svm.c +++ b/src/svm/svm.c @@ -76,14 +76,15 @@ svm_get_global_region_base_va () unformat_init_clib_file (&input, fd); while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT) { - unformat (&input, "%llx-%llx", &start, &end); + if (unformat (&input, "%llx-%llx", &start, &end)) + end--; unformat_skip_line (&input); } unformat_free (&input); close (fd); count_leading_zeros (bits, end); - bits = 64 - (bits + 1); + bits = 64 - bits; if (bits >= 36 && bits <= 48) return ((1ul << bits) / 4) - (2 * SVM_GLOBAL_REGION_SIZE); else -- cgit 1.2.3-korg