Skip to content

Commit aa61ee7

Browse files
Baoquan Hesuryasaimadhu
authored andcommitted
x86/mm: Remove the now redundant N_MEMORY check
In commit f70029b ("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 <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Wei Yang <[email protected]> Acked-by: Michal Hocko <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 17c4a2a commit aa61ee7

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/x86/mm/init_64.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,8 +818,7 @@ void __init paging_init(void)
818818
* will not set it back.
819819
*/
820820
node_clear_state(0, N_MEMORY);
821-
if (N_MEMORY != N_NORMAL_MEMORY)
822-
node_clear_state(0, N_NORMAL_MEMORY);
821+
node_clear_state(0, N_NORMAL_MEMORY);
823822

824823
zone_sizes_init();
825824
}

0 commit comments

Comments
 (0)