From ba8c3eb364d7065ca6c4605ba2a46220b6cd174d Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 13 Jan 2011 15:47:07 -0800
Subject: [PATCH] --- yaml --- r: 230795 b: refs/heads/master c:
 5d6892407cab23d4bf2f6de065ca351a53849323 h: refs/heads/master i:   230793:
 98e771dc7675f6a4090bb16f8558c3f26fa53df2   230791:
 d0b032784590a015183e4be809764700de1cc22d v: v3

---
 [refs]           | 2 +-
 trunk/mm/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5768123828a..75ef033eab0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13ece886d99cd668483113f7238e419d5331af26
+refs/heads/master: 5d6892407cab23d4bf2f6de065ca351a53849323
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 3e81687263b5..3ad483bdf505 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -305,6 +305,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
 config TRANSPARENT_HUGEPAGE
 	bool "Transparent Hugepage Support"
 	depends on X86 && MMU
+	select COMPACTION
 	help
 	  Transparent Hugepages allows the kernel to use huge pages and
 	  huge tlb transparently to the applications whenever possible.