diff options
| author |   Baoquan He <bhe@redhat.com> | 2020-03-11 09:18:23 +0800 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2020-03-17 19:12:39 +0100 |
| commit | aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46 (patch) | |
| tree | 921d4f26b6e823b0074a7f100314ee4b2253c532 /arch | |
| parent | dma-mapping: Fix dma_pgprot() for unencrypted coherent pages (diff) | |
| download | linux-dev-aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46.tar.xz linux-dev-aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46.zip | |
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@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Link: https://lkml.kernel.org/r/20200311011823.27740-1-bhe@redhat.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index abbdecb75fad..0a14711d3a93 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(); } |