From patchwork Tue Oct 1 09:01:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11168293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4053813B1 for ; Tue, 1 Oct 2019 09:03:34 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 24BBE21783 for ; Tue, 1 Oct 2019 09:03:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24BBE21783 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFE2p-0002tX-El; Tue, 01 Oct 2019 09:02:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFE2o-0002tR-Cj for xen-devel@lists.xenproject.org; Tue, 01 Oct 2019 09:02:06 +0000 X-Inumbo-ID: 20698a56-e42a-11e9-97fb-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by localhost (Halon) with ESMTPS id 20698a56-e42a-11e9-97fb-bc764e2007e4; Tue, 01 Oct 2019 09:01:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F203554CD; Tue, 1 Oct 2019 09:01:59 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-182.ams2.redhat.com [10.36.117.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8CA91D9; Tue, 1 Oct 2019 09:01:57 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Date: Tue, 1 Oct 2019 11:01:50 +0200 Message-Id: <20191001090152.1770-2-david@redhat.com> In-Reply-To: <20191001090152.1770-1-david@redhat.com> References: <20191001090152.1770-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 01 Oct 2019 09:01:59 +0000 (UTC) Subject: [Xen-devel] [PATCH v1 1/3] xen/balloon: Drop __balloon_append() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , David Hildenbrand , linux-mm@kvack.org, xen-devel@lists.xenproject.org, Boris Ostrovsky Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Let's simply use balloon_append() directly. Cc: Boris Ostrovsky Cc: Juergen Gross Cc: Stefano Stabellini Signed-off-by: David Hildenbrand Reviewed-by: Boris Ostrovsky --- drivers/xen/balloon.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 91cba70b69df..37443c5fda99 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -156,7 +156,7 @@ static DECLARE_DELAYED_WORK(balloon_worker, balloon_process); (GFP_HIGHUSER | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC) /* balloon_append: add the given page to the balloon. */ -static void __balloon_append(struct page *page) +static void balloon_append(struct page *page) { /* Lowmem is re-populated first, so highmem pages go at list tail. */ if (PageHighMem(page)) { @@ -169,11 +169,6 @@ static void __balloon_append(struct page *page) wake_up(&balloon_wq); } -static void balloon_append(struct page *page) -{ - __balloon_append(page); -} - /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ static struct page *balloon_retrieve(bool require_lowmem) { @@ -378,7 +373,7 @@ static void xen_online_page(struct page *page, unsigned int order) p = pfn_to_page(start_pfn + i); __online_page_set_limits(p); __SetPageOffline(p); - __balloon_append(p); + balloon_append(p); } mutex_unlock(&balloon_mutex); } @@ -689,7 +684,7 @@ static void __init balloon_add_region(unsigned long start_pfn, include the boot-time balloon extension, so don't subtract from it. */ __SetPageOffline(page); - __balloon_append(page); + balloon_append(page); } balloon_stats.total_pages += extra_pfn_end - start_pfn;