From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754261AbbLIKho (ORCPT ); Wed, 9 Dec 2015 05:37:44 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:45051 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754023AbbLIJjG (ORCPT ); Wed, 9 Dec 2015 04:39:06 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Yinghai Lu , Greg Kroah-Hartman , Luis Henriques Subject: [PATCH 3.16.y-ckt 024/126] Revert "mm: Check if section present during memory block (un)registering" Date: Wed, 9 Dec 2015 09:36:34 +0000 Message-Id: <1449653896-5236-25-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1449653896-5236-1-git-send-email-luis.henriques@canonical.com> References: <1449653896-5236-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 8346aa765e14348b7b436825b3c4740895a2fe1a upstream. This reverts commit 7568fb63f57ac8672f8bf2018171255441238882 as it's already in Linus's tree through a different patch. Reported-by: Tony Luck Cc: Yinghai Lu Signed-off-by: Greg Kroah-Hartman Signed-off-by: Luis Henriques --- drivers/base/node.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 7334e47996bc..5777d10d1e25 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -397,18 +397,7 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid) sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr); sect_end_pfn += PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { - int page_nid, scn_nr; - - /* - * memory block could have several absent sections from start. - * skip pfn range from absent section - */ - scn_nr = pfn_to_section_nr(pfn); - if (!present_section_nr(scn_nr)) { - pfn = round_down(pfn + PAGES_PER_SECTION, - PAGES_PER_SECTION) - 1; - continue; - } + int page_nid; /* * memory block could have several absent sections from start. @@ -454,22 +443,10 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, return -ENOMEM; nodes_clear(*unlinked_nodes); - sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr); - sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr); - sect_end_pfn += PAGES_PER_SECTION - 1; + sect_start_pfn = section_nr_to_pfn(phys_index); + sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { - int nid, scn_nr; - - /* - * memory block could have several absent sections from start. - * skip pfn range from absent section - */ - scn_nr = pfn_to_section_nr(pfn); - if (!present_section_nr(scn_nr)) { - pfn = round_down(pfn + PAGES_PER_SECTION, - PAGES_PER_SECTION) - 1; - continue; - } + int nid; nid = get_nid_for_pfn(pfn); if (nid < 0)