From patchwork Sun Mar 8 01:35:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11425401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 767031395 for ; Sun, 8 Mar 2020 01:35:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3905C207FD for ; Sun, 8 Mar 2020 01:35:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QEz88QMR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3905C207FD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 68DF96B0005; Sat, 7 Mar 2020 20:35:22 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 63E296B0006; Sat, 7 Mar 2020 20:35:22 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 556436B0007; Sat, 7 Mar 2020 20:35:22 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0208.hostedemail.com [216.40.44.208]) by kanga.kvack.org (Postfix) with ESMTP id 425B76B0005 for ; Sat, 7 Mar 2020 20:35:22 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D7B2A181AC9CB for ; Sun, 8 Mar 2020 01:35:21 +0000 (UTC) X-FDA: 76570477242.10.grain86_2ecc53436a002 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,bhe@redhat.com,,RULES_HIT:30054:30070,0,RBL:207.211.31.81:@redhat.com:.lbl8.mailshell.net-66.10.201.10 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:33,LUA_SUMMARY:none X-HE-Tag: grain86_2ecc53436a002 X-Filterd-Recvd-Size: 2550 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Sun, 8 Mar 2020 01:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583631321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=cZPB2ozd/CQzSBVuXVXyRx4Ij0GveypYhrYtlgrnwto=; b=QEz88QMRhWC16vJHDYNTtkZtN8zFVCT6Z6LpnZJzcuydv0LXJyN9WeoBloLA36LJHi4rnV 5ktm+5BlvLZW3fqIBKawrzRMll7NtPlfLxVTCoNQVzZpnYZGpryzI5JBGmnmfJ5mFyJAjS ZhX3MB5XUGSL3A3CTQtBAM5Ana7gfjs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-145-mWMxPYeDMM2RVUsW6w35Uw-1; Sat, 07 Mar 2020 20:35:17 -0500 X-MC-Unique: mWMxPYeDMM2RVUsW6w35Uw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AED718B5FA0; Sun, 8 Mar 2020 01:35:15 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-26.pek2.redhat.com [10.72.12.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id F01CD5C1B2; Sun, 8 Mar 2020 01:35:12 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, mhocko@suse.com, x86@kernel.org, bhe@redhat.com Subject: [PATCH] x86/mm: Remove the redundant conditional check Date: Sun, 8 Mar 2020 09:35:11 +0800 Message-Id: <20200308013511.12792-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In commit f70029bbaacbfa8f0 ("mm, memory_hotplug: drop CONFIG_MOVABLE_NODE"), the dependency on CONFIG_MOVABLE_NODE was removed for N_MEMORY, so the conditional check in paging_init() doesn't make any sense any more. Remove it. Signed-off-by: Baoquan He --- 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 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(); }