linux-kernel - [PATCH] virtio_balloon: fix build regression

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20171108120740.3137853-1-arnd@arndb.de>
Date:   Wed,  8 Nov 2017 13:07:10 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     "Michael S. Tsirkin" <mst@...hat.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Philippe Ombredanne <pombredanne@...b.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        linux-kernel@...r.kernel.org
Subject: [PATCH] virtio_balloon: fix build regression

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 <arnd@...db.de>
---
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