From patchwork Wed May 25 21:00:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 68639 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp68812qge; Wed, 25 May 2016 14:27:58 -0700 (PDT) X-Received: by 10.98.94.194 with SMTP id s185mr8788871pfb.135.1464211673218; Wed, 25 May 2016 14:27:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bf10si15177307pab.204.2016.05.25.14.27.52; Wed, 25 May 2016 14:27:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752405AbcEYV1c (ORCPT + 30 others); Wed, 25 May 2016 17:27:32 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34047 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752347AbcEYV13 (ORCPT ); Wed, 25 May 2016 17:27:29 -0400 Received: by mail-pa0-f47.google.com with SMTP id qo8so21495829pab.1 for ; Wed, 25 May 2016 14:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=p1lDIsm2QkQ58Gnm2Bh6DB8K6B8Dsgsf0tdmJ8z+QuY=; b=CbDqPLn6QLGWqetjWhJj7xvn53koh5FCCFwRhmH/6scwsF92eFwqIYAbWjmheyMVq4 RGfopQZFFD9i1Wtv5ZBZzZ0FRtD2Terd7mX785180+lwiwA3NWe3JJP0DloEN/CSu0gz 6EBHqvsfg5s/ns6wRA//L4R9T6RMsu7w2qEgI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p1lDIsm2QkQ58Gnm2Bh6DB8K6B8Dsgsf0tdmJ8z+QuY=; b=gPH75/nVqc/dKQDspdmR7nX/sy3bjzBqUes7yvUNbFV/E070NavvzKFJ73tSqbF/AF RLd6GemInYdXdRcV0vuilQk7ampr2qJQ/CLudo+ov3kQ2mrWNaBZR/5bfTloeaT2M5m2 P4t/yprtEytFKRT+iCQBwe00nroI/FFS+FVo3jr5sCxxqaKSyI2BJepz4HPFGl1/RlXH uhDHZsGZlvYN9Rkyih2nRx5muE7iHvqPiIqfnh8hPdtPdd8zuVAAFyYRjv54G/ycggAR rsSfnYWLdXk9qvSen+qpy6uWUlxW8o3W7wKy/BlihgrndOcyu+7RExQ64WfztCxSCWGe ZIBg== X-Gm-Message-State: ALyK8tJY5DgrmaJ2O45LzrL/OV8pirP1TGXr1XA6PdnUuNDX/IntcwRSZqKy5xY0UTxrfVfp X-Received: by 10.66.186.70 with SMTP id fi6mr8846417pac.3.1464211648736; Wed, 25 May 2016 14:27:28 -0700 (PDT) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id b19sm642956pfb.55.2016.05.25.14.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2016 14:27:28 -0700 (PDT) From: Yang Shi To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [PATCH] mm: use early_pfn_to_nid in register_page_bootmem_info_node Date: Wed, 25 May 2016 14:00:07 -0700 Message-Id: <1464210007-30930-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org register_page_bootmem_info_node() is invoked in mem_init(), so it will be called before page_alloc_init_late() if CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled. But, pfn_to_nid() depends on memmap which won't be fully setup until page_alloc_init_late() is done, so replace pfn_to_nid() by early_pfn_to_nid(). Signed-off-by: Yang Shi --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.0.2 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index caf2a14..b8ee080 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -300,7 +300,7 @@ void register_page_bootmem_info_node(struct pglist_data *pgdat) * multiple nodes we check that this pfn does not already * reside in some other nodes. */ - if (pfn_valid(pfn) && (pfn_to_nid(pfn) == node)) + if (pfn_valid(pfn) && (early_pfn_to_nid(pfn) == node)) register_page_bootmem_info_section(pfn); } }