From: Baoquan He <bhe@redhat.com>
To: Borislav Petkov <bp@suse.de>, akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [tip: x86/mm] x86/mm: Remove the now redundant N_MEMORY check
Date: Wed, 18 Mar 2020 10:49:42 +0800 [thread overview]
Message-ID: <20200318024942.GA30899@MiWiFi-R3L-srv> (raw)
In-Reply-To: <158446925404.28353.8374899643384906431.tip-bot2@tip-bot2>
Hi,
On 03/17/20 at 06:20pm, tip-bot2 for Baoquan He wrote:
> 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@redhat.com>
> AuthorDate: Wed, 11 Mar 2020 09:18:23 +08:00
> Committer: Borislav Petkov <bp@suse.de>
> CommitterDate: Tue, 17 Mar 2020 19:12:39 +01:00
Just a soft reminder, I also got a notice from Andrew that this was picked
into his -mm tree before. Maybe one can be dropped to avoid conflict
when sending to Linus.
Thanks for taking care of this.
>
> 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
> ---
> 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();
> }
>
prev parent reply other threads:[~2020-03-18 2:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 1:18 [PATCH v2] x86/mm: Remove the redundant conditional check Baoquan He
2020-03-11 9:27 ` Michal Hocko
2020-03-14 15:10 ` Wei Yang
2020-03-15 12:49 ` Baoquan He
2020-03-15 21:56 ` Wei Yang
2020-03-17 18:20 ` [tip: x86/mm] x86/mm: Remove the now redundant N_MEMORY check tip-bot2 for Baoquan He
2020-03-18 2:49 ` Baoquan He [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200318024942.GA30899@MiWiFi-R3L-srv \
--to=bhe@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).