commit d4017a4670e9320943fb454e54d74561f85db289
author danh-arm <dan.handley@arm.com> Wed Apr 27 09:38:40 2016 +0100
committer danh-arm <dan.handley@arm.com> Wed Apr 27 09:38:40 2016 +0100
tree f22a51730508a6aba53438896618ba1689f0cc94
parent c476155c46c77c00c4c43372dd1d3af54c9c3d4c
parent 4ba6b0b16a459e1c336892025917bb21da5a77e5

Merge pull request #611 from sandrine-bailleux-arm/sb/fix-init_xlation_table_inner

Fix computation of L1 bitmask in the translation table lib

lib/xlat_tables/xlat_tables_common.c

diff --git a/lib/xlat_tables/xlat_tables_common.c b/lib/xlat_tables/xlat_tables_common.c
index 54c528c..fd10084 100644
--- a/lib/xlat_tables/xlat_tables_common.c
+++ b/lib/xlat_tables/xlat_tables_common.c
@@ -284,8 +284,9 @@
 	unsigned level_size_shift = L1_XLAT_ADDRESS_SHIFT - (level - 1) *
 						XLAT_TABLE_ENTRIES_SHIFT;
 	unsigned level_size = 1 << level_size_shift;
-	unsigned long long level_index_mask = XLAT_TABLE_ENTRIES_MASK <<
-							level_size_shift;
+	unsigned long long level_index_mask =
+		((unsigned long long) XLAT_TABLE_ENTRIES_MASK)
+		<< level_size_shift;
 
 	assert(level > 0 && level <= 3);