[PATCH] mm: Disable mm/balloon_compaction.c completely when !CONFIG_BALLOON_COMPACTION

[Josh Triplett <josh@joshtriplett.org>]

mm/balloon_compaction.c contains ifdefs around some of its functions
when !CONFIG_BALLOON_COMPACTION, but the remaining functions aren't used
in that case either.  Drop the ifdefs in the file, and move
mm/balloon_compaction.o to obj-$(CONFIG_BALLOON_COMPACTION).

In addition to eliminating that ifdef, this also saves some space;
bloat-o-meter statistics:
add/remove: 0/3 grow/shrink: 0/0 up/down: 0/-281 (-281)
function                                     old     new   delta
balloon_devinfo_alloc                         63       -     -63
balloon_page_enqueue                          84       -     -84
balloon_page_dequeue                         134       -    -134

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
---
 mm/Makefile             | 4 ++--
 mm/balloon_compaction.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mm/Makefile b/mm/Makefile
index 310c90a..1e6ab7d 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -16,7 +16,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
 			   readahead.o swap.o truncate.o vmscan.o shmem.o \
 			   util.o mmzone.o vmstat.o backing-dev.o \
 			   mm_init.o mmu_context.o percpu.o slab_common.o \
-			   compaction.o balloon_compaction.o \
+			   compaction.o \
 			   interval_tree.o list_lru.o $(mmu-y)
 
 obj-y += init-mm.o
@@ -28,7 +28,7 @@ else
 endif
 
 obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
-
+obj-$(CONFIG_BALLOON_COMPACTION) += balloon_compaction.o
 obj-$(CONFIG_BOUNCE)	+= bounce.o
 obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
 obj-$(CONFIG_FRONTSWAP)	+= frontswap.o
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c
index 6e45a50..8339787 100644
--- a/mm/balloon_compaction.c
+++ b/mm/balloon_compaction.c
@@ -131,7 +131,6 @@ struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info)
 }
 EXPORT_SYMBOL_GPL(balloon_page_dequeue);
 
-#ifdef CONFIG_BALLOON_COMPACTION
 /*
  * balloon_mapping_alloc - allocates a special ->mapping for ballooned pages.
  * @b_dev_info: holds the balloon device information descriptor.
@@ -299,4 +298,3 @@ int balloon_page_migrate(struct page *newpage,
 	unlock_page(newpage);
 	return rc;
 }
-#endif /* CONFIG_BALLOON_COMPACTION */
-- 
1.9.0

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>