From patchwork Wed Nov 8 12:07:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118245 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp1716803edm; Wed, 8 Nov 2017 04:07:56 -0800 (PST) X-Google-Smtp-Source: ABhQp+SoSv7PHr9OHrdTEPejDkKh80OdPfXpjmJFH1rls0AcDvL2SiW5ANv9KMBRxV+NEhoGV5y/ X-Received: by 10.84.233.12 with SMTP id j12mr259261plk.420.1510142876776; Wed, 08 Nov 2017 04:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510142876; cv=none; d=google.com; s=arc-20160816; b=YvVsjkwSPUePfu1NHPahsYkC+rJykgzIT2ezfX9p3wl83U3KaIZXzqzMchb0yuUkTz i9/TLxzvhcL5sxfY31fBr61LT0HB5212/fPinEkdStL/63oEf6DzN8DnhfGsPuHDbsqr 5FMn9+5PVdETT0Zrc69VcjAzQz7YdNx/yVjSrNn1jtAnUbxXeNCbEbynC7FGZBHZLQbA ST+Lb3z1++YjBukxtTfYIJM3vxMC7ru9HoeW23yTKttO55NXJpAXCPmo+6zVihxh0cM1 UlMTlCD5y2jKygXls9RQ5LoLOeuSc1D2xt/oVDdj4oRdq4uyRQK1TZkvOIsZUlDoDVXF VPqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=5Dy1NFIYk82ztr/12jrequdxg5SVD3LDUUWQUHz9gAM=; b=Lp6XgrBksRA70GcDDnxNuBSQfqMM4RkvydoJKvzqfDWgs/uZepTT1/x7GzBADDAzeJ +JNcciUnPcOLy5hd2uLqd7GpveBp4q2ZMRYHrv8jYaHzkQZ6R5EBPQUiWDEGM69dByQl AckIA14soC8bk7FU9dEEW5cgos9JLDW3IIGPnA0CFPYkJo6yHhSZ8pRMZj2QfC70v4Rl Z+jcEv3Kh5EwNCYbzamokzvqBC+O9UIjKnjmXiPghrH2qBCosqOJazka/hll7A2chQK9 rDryDyovZ44mdxAU2Ly/a+B0JTDOnDsAnh+ZzVamMpN020QroOA6qnZIf2Gc8HnOtfi/ QMGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si3669914plw.224.2017.11.08.04.07.56; Wed, 08 Nov 2017 04:07:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752211AbdKHMHy (ORCPT + 21 others); Wed, 8 Nov 2017 07:07:54 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:55439 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbdKHMHx (ORCPT ); Wed, 8 Nov 2017 07:07:53 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXCaX-1eiSdM3rFN-00WFiu; Wed, 08 Nov 2017 13:07:42 +0100 From: Arnd Bergmann To: "Michael S. Tsirkin" Cc: Arnd Bergmann , Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] virtio_balloon: fix build regression Date: Wed, 8 Nov 2017 13:07:10 +0100 Message-Id: <20171108120740.3137853-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:6FF94W/MUJn7df2AkLd0KHrGKaDIbBZWwkyETruSjPQ/s9Xdmjz 6NvkYbYqNVRF8YOM5puK9xJ3rwn1iqNUE/qxYeNz88yrXigEDRTkuqgcxbgUbxZwro3TMO7 mWv9VjPx7jOKuzdmW6ZfAskvFQx52jqaDqEQPSvoXjwIdSUrEyH/E6N/EzkIxH3P/uNRSvC 5oZwvzerDR4b4UvsE+Auw== X-UI-Out-Filterresults: notjunk:1; V01:K0:KZGAQC6BFvg=:LHNPAMAoKsedtqX9cIGFuY iQfCqG81J5/1gpkfqElQJqPgxv/qvOlWnCwiFtWgmDsC7oXqSL4mtNnVPsa3bWErk2Ujfr8w5 T5hEX5Dn2B7ZZ6KaL+fcb9d/u8ufqE2fOy5WpRpA/+PMqW1tlDZdrCBZ+NMf05UvF62bFSe8h be/um8BiCXVMZcOcBxBjJc/4m18h0PCFyCzvTKi0SlA7EqeSn6XQU42SP62JFS2yBnNJCpQar mS3CL4QpTqFahiyz4Q5SA5W+FncEAj9tKlrdFzHMJcR322phTm3O+PgGtSo04AmlWUSAuBK5u h2BPe7nJzYEGBhWEzHNYNYGCmsDLvoXKwrAF+yW7e0M+A+d2A2dBEOEK6Hvccx5CO+XdCabyF 7MI+WGEqeUHitfYdazWaq2rYlVngsKNI80xPIWEZct/7aI9fstvTFNjeSBi8mY38jpLgOHF1c no91+SLqJb4UcvSDPy4yCjDr5GiMsenyjqz9CNMKKbNwsnWwaH7XvGKtz20ExPVRRmDLrLdL5 LlQhfKrzgLajl61Rlzl9q/WM96rS6V0K/ZQxzZnKIUSKjqTiQvWwaQFeW73QrFexwsy+XfV3c nEU1VKuPh6NqMLPpITvNLXPQgCzoiFpPDrEUpCtJhfnxvhQ+HaZix7BLa0MfUgMUoARQfkccw 8m6pNodrtguDb78NQ81mn+Coer+lqPCCpRdUTTxL39Np974cRf0LQQWDhsmE0vhjYIrzVAtdI +2IDOcCq2I8Wf1m60q9k/WQWFJDPrGAcbzsZiQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new balloon_page_push/balloon_page_pop helpers got added inside of an #ifdef, causing a build failure when CONFIG_BALLOON_COMPACTION is disabled: drivers/virtio/virtio_balloon.c: In function 'fill_balloon': drivers/virtio/virtio_balloon.c:164:3: error: implicit declaration of function 'balloon_page_push' This adds another empty stub function for the case that CONFIG_BALLOON_COMPACTION is disabled. Fixes: f09517b35de8 ("virtio_balloon: fix deadlock on OOM") Signed-off-by: Arnd Bergmann --- I couldn't easily figure out whether the new functions were indeed intended to be only used when BALLOON_COMPACTION is enabled, or whether they should always be there. In case I picked the wrong one of the two, the answer would obviously be to move the definitions outside of the #ifdef, or into a different file. --- include/linux/balloon_compaction.h | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.9.0 diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 36734ff07213..730b962fd572 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -223,6 +223,15 @@ static inline int balloon_page_migrate(struct page *newpage, return 0; } +static inline void balloon_page_push(struct list_head *pages, struct page *page) +{ +} + +static inline struct page *balloon_page_pop(struct list_head *pages) +{ + return NULL; +} + static inline gfp_t balloon_mapping_gfp_mask(void) { return GFP_HIGHUSER;