summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuacai Chen <chenhuacai@loongson.cn>2023-09-27 16:19:13 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-06 14:57:01 +0200
commit490f3b805ee3639e8b69c91d63e1ea76189950ae (patch)
tree9bfc43a52bbdbd791b041194465b7c89bf8333bf
parent7bc8585aa0719dd1996be804dd4fba601d48f3d6 (diff)
downloadlinux-stable-490f3b805ee3639e8b69c91d63e1ea76189950ae.tar.gz
linux-stable-490f3b805ee3639e8b69c91d63e1ea76189950ae.tar.bz2
linux-stable-490f3b805ee3639e8b69c91d63e1ea76189950ae.zip
LoongArch: numa: Fix high_memory calculation
commit 1943feecf80e73ecc03ce40271f29c6cea142bac upstream. For 64bit kernel without HIGHMEM, high_memory is the virtual address of the highest physical address in the system. But __va(get_num_physpages() << PAGE_SHIFT) is not what we want for high_memory because there may be holes in the physical address space. On the other hand, max_low_pfn is calculated from memblock_end_of_DRAM(), which is exactly corresponding to the highest physical address, so use it for high_memory calculation. Cc: <stable@vger.kernel.org> Fixes: d4b6f1562a3c3284adce ("LoongArch: Add Non-Uniform Memory Access (NUMA) support") Signed-off-by: Chong Qiao <qiaochong@loongson.cn> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/loongarch/kernel/numa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/loongarch/kernel/numa.c b/arch/loongarch/kernel/numa.c
index a13f92593cfd..f7ffce170213 100644
--- a/arch/loongarch/kernel/numa.c
+++ b/arch/loongarch/kernel/numa.c
@@ -453,7 +453,7 @@ void __init paging_init(void)
void __init mem_init(void)
{
- high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
+ high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
memblock_free_all();
setup_zero_pages(); /* This comes from node 0 */
}