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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 E346DC10F14 for ; Sun, 6 Oct 2019 08:57:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B2D292133F for ; Sun, 6 Oct 2019 08:57:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2D292133F 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 675A16B0266; Sun, 6 Oct 2019 04:57:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 625DD6B0269; Sun, 6 Oct 2019 04:57:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53DA56B026A; Sun, 6 Oct 2019 04:57:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0001.hostedemail.com [216.40.44.1]) by kanga.kvack.org (Postfix) with ESMTP id 2F2CB6B0266 for ; Sun, 6 Oct 2019 04:57:44 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id B31B7181AC9AE for ; Sun, 6 Oct 2019 08:57:43 +0000 (UTC) X-FDA: 76012756806.18.jump62_264eace425112 X-HE-Tag: jump62_264eace425112 X-Filterd-Recvd-Size: 4215 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Sun, 6 Oct 2019 08:57:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5382B308123B; Sun, 6 Oct 2019 08:57:42 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85A435EE1D; Sun, 6 Oct 2019 08:57:39 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, x86@kernel.org, David Hildenbrand , Andrew Morton , Oscar Salvador , Michal Hocko , Pavel Tatashin , Dan Williams , Wei Yang Subject: [PATCH v6 09/10] mm/memory_hotplug: Drop local variables in shrink_zone_span() Date: Sun, 6 Oct 2019 10:56:45 +0200 Message-Id: <20191006085646.5768-10-david@redhat.com> In-Reply-To: <20191006085646.5768-1-david@redhat.com> References: <20191006085646.5768-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Sun, 06 Oct 2019 08:57:42 +0000 (UTC) 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: Get rid of the unnecessary local variables. Cc: Andrew Morton Cc: Oscar Salvador Cc: David Hildenbrand Cc: Michal Hocko Cc: Pavel Tatashin Cc: Dan Williams Cc: Wei Yang Signed-off-by: David Hildenbrand --- mm/memory_hotplug.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8dafa1ba8d9f..843481bd507d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -374,14 +374,11 @@ static unsigned long find_biggest_section_pfn(int n= id, struct zone *zone, static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) { - unsigned long zone_start_pfn =3D zone->zone_start_pfn; - unsigned long z =3D zone_end_pfn(zone); /* zone_end_pfn namespace clash= */ - unsigned long zone_end_pfn =3D z; unsigned long pfn; int nid =3D zone_to_nid(zone); =20 zone_span_writelock(zone); - if (zone_start_pfn =3D=3D start_pfn) { + if (zone->zone_start_pfn =3D=3D start_pfn) { /* * If the section is smallest section in the zone, it need * shrink zone->zone_start_pfn and zone->zone_spanned_pages. @@ -389,25 +386,25 @@ static void shrink_zone_span(struct zone *zone, uns= igned long start_pfn, * for shrinking zone. */ pfn =3D find_smallest_section_pfn(nid, zone, end_pfn, - zone_end_pfn); + zone_end_pfn(zone)); if (pfn) { + zone->spanned_pages =3D zone_end_pfn(zone) - pfn; zone->zone_start_pfn =3D pfn; - zone->spanned_pages =3D zone_end_pfn - pfn; } else { zone->zone_start_pfn =3D 0; zone->spanned_pages =3D 0; } - } else if (zone_end_pfn =3D=3D end_pfn) { + } else if (zone_end_pfn(zone) =3D=3D end_pfn) { /* * If the section is biggest section in the zone, it need * shrink zone->spanned_pages. * In this case, we find second biggest valid mem_section for * shrinking zone. */ - pfn =3D find_biggest_section_pfn(nid, zone, zone_start_pfn, + pfn =3D find_biggest_section_pfn(nid, zone, zone->zone_start_pfn, start_pfn); if (pfn) - zone->spanned_pages =3D pfn - zone_start_pfn + 1; + zone->spanned_pages =3D pfn - zone->zone_start_pfn + 1; else { zone->zone_start_pfn =3D 0; zone->spanned_pages =3D 0; --=20 2.21.0