From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A9E5C07E95 for ; Tue, 13 Jul 2021 08:00:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C830360BD3 for ; Tue, 13 Jul 2021 08:00:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C830360BD3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 051276B0096; Tue, 13 Jul 2021 04:00:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0002C6B0098; Tue, 13 Jul 2021 04:00:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D47E36B0099; Tue, 13 Jul 2021 04:00:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0142.hostedemail.com [216.40.44.142]) by kanga.kvack.org (Postfix) with ESMTP id AC02B6B0096 for ; Tue, 13 Jul 2021 04:00:48 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AD865183A1ED4 for ; Tue, 13 Jul 2021 08:00:47 +0000 (UTC) X-FDA: 78356818134.26.80A06A8 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf19.hostedemail.com (Postfix) with ESMTP id 5249EB001989 for ; Tue, 13 Jul 2021 08:00:47 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id B410E6120A; Tue, 13 Jul 2021 08:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626163246; bh=wO4nJtb/0wmA00Vei0+gmgdy2aWHz0Ba7T19Y+vP1x8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gRsc61qxHMAb+kt6H/RN8zE95GSoRZyVLOgD6w+LR3twa5veB913+sEn8WAZbqMxI hbZ6PngcwX6uB4K7gBtnCmDpVwqZhPffRagPxGQrANgpY1NPh0EqRicEC+KQQI7szH lKF4aLAH0MUVZ881P9r+o4mmXEjUmAKePNHr1l7xu9yXsMuFrChorqQErn2uXErRnK xeIxnj4USn/RVRGlQQhQVNAF7FtJim3zdOTontWzNCT8JfmaswipC9R87Ims1EGeZm iFxUy9NKpBZJAZluUUu7Mp0bBoH5skAZIKccZk4qiEFGeWITY9OfXz+UAXjx8IhwV9 FTvfI3kMGVI6g== From: Mike Rapoport To: Andrew Morton Cc: Greg Kroah-Hartman , Mike Rapoport , Mike Rapoport , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/2] mm: memory_hotplug: cleanup after removal of pfn_valid_within() Date: Tue, 13 Jul 2021 11:00:35 +0300 Message-Id: <20210713080035.7464-3-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210713080035.7464-1-rppt@kernel.org> References: <20210713080035.7464-1-rppt@kernel.org> MIME-Version: 1.0 Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=gRsc61qx; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Stat-Signature: m6tyy51bxsszhz4w18a1w5g99ky5u149 X-Rspamd-Queue-Id: 5249EB001989 X-Rspamd-Server: rspam01 X-HE-Tag: 1626163247-394964 Content-Transfer-Encoding: quoted-printable 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: From: Mike Rapoport When test_pages_in_a_zone() used pfn_valid_within() is has some logic surrounding pfn_valid_within() checks. Since pfn_valid_within() is gone, this logic can be removed. Signed-off-by: Mike Rapoport --- mm/memory_hotplug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1085bd03ecba..ca09045bb587 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1298,7 +1298,7 @@ struct zone *test_pages_in_a_zone(unsigned long sta= rt_pfn, unsigned long pfn, sec_end_pfn; struct zone *zone =3D NULL; struct page *page; - int i; + for (pfn =3D start_pfn, sec_end_pfn =3D SECTION_ALIGN_UP(start_pfn + 1)= ; pfn < end_pfn; pfn =3D sec_end_pfn, sec_end_pfn +=3D PAGES_PER_SECTION) { @@ -1307,13 +1307,10 @@ struct zone *test_pages_in_a_zone(unsigned long s= tart_pfn, continue; for (; pfn < sec_end_pfn && pfn < end_pfn; pfn +=3D MAX_ORDER_NR_PAGES) { - i =3D 0; - if (i =3D=3D MAX_ORDER_NR_PAGES || pfn + i >=3D end_pfn) - continue; /* Check if we got outside of the zone */ - if (zone && !zone_spans_pfn(zone, pfn + i)) + if (zone && !zone_spans_pfn(zone, pfn)) return NULL; - page =3D pfn_to_page(pfn + i); + page =3D pfn_to_page(pfn); if (zone && page_zone(page) !=3D zone) return NULL; zone =3D page_zone(page); --=20 2.28.0