From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210AbdKHMHy (ORCPT ); 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 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 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(+) 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; -- 2.9.0