From a61353cc58794595e3bf252296deda80646d86ea Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Nov 19 2013 13:09:44 +0000
Subject: Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984)


---

diff --git a/config-powerpc64 b/config-powerpc64
index 73f2b2b..c3f57b1 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -97,6 +97,8 @@ CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTREMOVE=y
 
+CONFIG_CGROUP_HUGETLB=y
+
 # CONFIG_MV643XX_ETH is not set
 CONFIG_IRQSTACKS=y
 CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 7ab1918..8f09bc8 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -88,6 +88,8 @@ CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTREMOVE=y
 
+CONFIG_CGROUP_HUGETLB=y
+
 # CONFIG_MV643XX_ETH is not set
 CONFIG_IRQSTACKS=y
 CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 85f588b..bd46593 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -30,6 +30,7 @@ CONFIG_SWIOTLB=y
 # CONFIG_CALGARY_IOMMU is not set
 
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CGROUP_HUGETLB=y
 CONFIG_MEM_SOFT_DIRTY=y
 
 CONFIG_KEXEC_JUMP=y
diff --git a/kernel.spec b/kernel.spec
index d4a4005..87d9b57 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2404,6 +2404,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984)
+
 * Mon Nov 18 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Add patch to fix rhel5.9 KVM guests (rhbz 967652)
 - Add patch to fix crash from slab when using md-raid mirrors (rhbz 1031086)