From 0d56293817315073b2b07471d5889a5bdf6550ee Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Thu, 22 Apr 2021 17:12:26 +0530 Subject: lib: sbi: Fix sbi_domain_root_add_memregion() for merging memregions We should decrement root_memregs_count by one after merging two memregions otherwise new memregion added after a merge will be appended after last sentinel memregion of zero order. Signed-off-by: Anup Patel Reviewed-by: Xiang W --- lib/sbi/sbi_domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index 69a3795..1b2e6e3 100644 --- a/lib/sbi/sbi_domain.c +++ b/lib/sbi/sbi_domain.c @@ -521,6 +521,7 @@ int sbi_domain_root_add_memregion(const struct sbi_domain_memregion *reg) nreg1++; } reg_merged = true; + root_memregs_count--; } } } while (reg_merged); -- cgit v1.2.3