Commit aa61ee7b authored by Baoquan He's avatar Baoquan He Committed by Borislav Petkov

x86/mm: Remove the now redundant N_MEMORY check

In commit

  f70029bb ("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: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarWei Yang <richard.weiyang@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Link: https://lkml.kernel.org/r/20200311011823.27740-1-bhe@redhat.com
parent 17c4a2ae
...@@ -818,7 +818,6 @@ void __init paging_init(void) ...@@ -818,7 +818,6 @@ void __init paging_init(void)
* will not set it back. * will not set it back.
*/ */
node_clear_state(0, N_MEMORY); 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(); zone_sizes_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment