From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 9 Nov 2012 03:04:31 +0000 (+1100)
Subject: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix
X-Git-Tag: next-20121112~5^2~154
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc2afe94a1b56f2a48084335d14b8fc6250c247a;p=karo-tx-linux.git

mm-introduce-a-common-interface-for-balloon-pages-mobility-fix

fix build with CONFIG_BALLOON_COMPACTION=n

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h
index 1865bd505ec5..e339dd929cc6 100644
--- a/include/linux/balloon_compaction.h
+++ b/include/linux/balloon_compaction.h
@@ -207,10 +207,8 @@ static inline gfp_t balloon_mapping_gfp_mask(void)
 	return GFP_HIGHUSER;
 }
 
-static inline void balloon_event_count(enum vm_event_item item)
-{
-	return;
-}
+/* A macro, to avoid generating references to the undefined COMPACTBALLOON* */
+#define balloon_event_count(item) do { } while (0)
 
 static inline bool balloon_compaction_check(void)
 {