Since add_range_with_merge() return the max none zero element of the array, it's
suffice to use it to instruct clean_sort_range() to do the sort. Or the former
assignment by add_range_with_merge() is nonsense because clean_sort_range()
will produce a accurate number of the sorted array and it never depends on
nr_pfn_mapped.
Cc: Jacob Shin <jacob.s...@amd.com>
Cc: Yinghai Lu <ying...@kernel.org>
Signed-off-by: Lin Feng <linf...@cn.fujitsu.com>
---
arch/x86/mm/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 59b7fc4..55ae904 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -310,7 +310,7 @@ static void add_pfn_range_mapped(unsigned long start_pfn,
unsigned long end_pfn)
{
nr_pfn_mapped = add_range_with_merge(pfn_mapped, E820_X_MAX,
nr_pfn_mapped, start_pfn, end_pfn);
- nr_pfn_mapped = clean_sort_range(pfn_mapped, E820_X_MAX);
+ nr_pfn_mapped = clean_sort_range(pfn_mapped, nr_pfn_mapped);
max_pfn_mapped = max(max_pfn_mapped, end_pfn);
--
1.8.0.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
