From d0b032784590a015183e4be809764700de1cc22d Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 13 Jan 2011 15:47:05 -0800
Subject: [PATCH] --- yaml --- r: 230791 b: refs/heads/master c:
 d39d33c332c611094f84cee39715866f4cbf79e2 h: refs/heads/master i:   230789:
 bd6402c198935cfdd105e84b2b55f22ae2ffd99a   230787:
 21ecd75362aadc5a86bae11bd4e370854bef0f04   230783:
 0bb77c67a20369c0d109e35622430e93746bc565 v: v3

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

diff --git a/[refs] b/[refs]
index 6a22e0ef2a50..44a0b36c3ecc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f000565adb770b14cebbafde0a4f3e61a3342a63
+refs/heads/master: d39d33c332c611094f84cee39715866f4cbf79e2
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 4ed97a2a115f..0415a83afd66 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -28,6 +28,7 @@
  */
 unsigned long transparent_hugepage_flags __read_mostly =
 	(1<<TRANSPARENT_HUGEPAGE_FLAG)|
+	(1<<TRANSPARENT_HUGEPAGE_DEFRAG_FLAG)|
 	(1<<TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG);
 
 /* default scan 8*512 pte (or vmas) every 30 second */