]> git.baikalelectronics.ru Git - kernel.git/commit
x86/mm: Remove the now redundant N_MEMORY check
authorBaoquan He <bhe@redhat.com>
Wed, 11 Mar 2020 01:18:23 +0000 (09:18 +0800)
committerBorislav Petkov <bp@suse.de>
Tue, 17 Mar 2020 18:12:39 +0000 (19:12 +0100)
commit8f95e611e6d24e5a1c695ab11f2524a999d4008f
tree921d4f26b6e823b0074a7f100314ee4b2253c532
parent1ed1aba031bdb21aabf061d33cad9356a3f62a4a
x86/mm: Remove the now redundant N_MEMORY check

In commit

  6aa6a0dd6f77 ("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
arch/x86/mm/init_64.c