From patchwork Tue Mar 22 21:47:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12789259 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1324AC433F5 for ; Tue, 22 Mar 2022 21:47:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F1766B0182; Tue, 22 Mar 2022 17:47:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A0356B0183; Tue, 22 Mar 2022 17:47:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8900B6B0184; Tue, 22 Mar 2022 17:47:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0069.hostedemail.com [216.40.44.69]) by kanga.kvack.org (Postfix) with ESMTP id 762446B0182 for ; Tue, 22 Mar 2022 17:47:27 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 3D9871828AE47 for ; Tue, 22 Mar 2022 21:47:27 +0000 (UTC) X-FDA: 79273358934.22.E9F8186 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id C1DFCC0017 for ; Tue, 22 Mar 2022 21:47:26 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 432CB61658; Tue, 22 Mar 2022 21:47:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C4D1C340EC; Tue, 22 Mar 2022 21:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1647985645; bh=ie5oGyxFVGCmNbNWfhit0ER4qM+rx5o2roKxzo/Yspw=; h=Date:To:From:In-Reply-To:Subject:From; b=DsrlBd6LYdCqB5WYWmmx1lC715pxpsyad84nYsBPDx1S9uIoVkSZuNBfN5WmjUfLC tGdjdK2/vmqImvp75RHXNC5Ef3jDIN/GmzHmvEw5BJJqJx8duZEEVBC3TfEsz/2haN LcUvkGqpY64aUvkvT+GIXgXtWfEVpAcWk2geRSMo= Date: Tue, 22 Mar 2022 14:47:24 -0700 To: osalvador@suse.de,david@redhat.com,linmiaohe@huawei.com,akpm@linux-foundation.org,patches@lists.linux.dev,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org From: Andrew Morton In-Reply-To: <20220322143803.04a5e59a07e48284f196a2f9@linux-foundation.org> Subject: [patch 175/227] mm/memory_hotplug: fix misplaced comment in offline_pages Message-Id: <20220322214725.9C4D1C340EC@smtp.kernel.org> X-Stat-Signature: n1fawxey55u6gyaqaeh6a4q1kzrub185 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=DsrlBd6L; spf=pass (imf22.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C1DFCC0017 X-HE-Tag: 1647985646-567528 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: Miaohe Lin Subject: mm/memory_hotplug: fix misplaced comment in offline_pages It's misplaced since commit 7960509329c2 ("mm, memory_hotplug: print reason for the offlining failure"). Move it to the right place. Link: https://lkml.kernel.org/r/20220207133643.23427-5-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: David Hildenbrand Reviewed-by: Oscar Salvador Signed-off-by: Andrew Morton --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-fix-misplaced-comment-in-offline_pages +++ a/mm/memory_hotplug.c @@ -1963,6 +1963,7 @@ int __ref offline_pages(unsigned long st return 0; failed_removal_isolated: + /* pushback to free area */ undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); memory_notify(MEM_CANCEL_OFFLINE, &arg); failed_removal_pcplists_disabled: @@ -1973,7 +1974,6 @@ failed_removal: (unsigned long long) start_pfn << PAGE_SHIFT, ((unsigned long long) end_pfn << PAGE_SHIFT) - 1, reason); - /* pushback to free area */ mem_hotplug_done(); return ret; }