The following commit has been merged into the x86/mm branch of tip:
Commit-ID: aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46
Gitweb: https://git.kernel.org/tip/aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46
Author: Baoquan He <bhe@xxxxxxxxxx>
AuthorDate: Wed, 11 Mar 2020 09:18:23 +08:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 17 Mar 2020 19:12:39 +01:00
x86/mm: Remove the now redundant N_MEMORY check
In commit
f70029bbaacb ("mm, memory_hotplug: drop CONFIG_MOVABLE_NODE")
the dependency on CONFIG_MOVABLE_NODE was removed for N_MEMORY.
Before, CONFIG_HIGHMEM && !CONFIG_MOVABLE_NODE could make (N_MEMORY ==
N_NORMAL_MEMORY) be true.
After that commit, N_MEMORY cannot be equal to N_NORMAL_MEMORY. So the
conditional check in paging_init() is not needed anymore, remove it.
[ bp: Massage. ]
Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Wei Yang <richard.weiyang@xxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Link: https://lkml.kernel.org/r/20200311011823.27740-1-bhe@xxxxxxxxxx
---
arch/x86/mm/init_64.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index abbdecb..0a14711 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -818,8 +818,7 @@ void __init paging_init(void)
* will not set it back.
*/
node_clear_state(0, N_MEMORY);
- if (N_MEMORY != N_NORMAL_MEMORY)
- node_clear_state(0, N_NORMAL_MEMORY);
+ node_clear_state(0, N_NORMAL_MEMORY);
zone_sizes_init();
}
|