From d4d966eac2320a4170ce975dd90cd5974080c179 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 19 Nov 2013 08:06:59 -0500 Subject: [PATCH] Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984) --- config-powerpc64 | 2 ++ config-powerpc64p7 | 2 ++ config-x86_64-generic | 1 + kernel.spec | 3 +++ 4 files changed, 8 insertions(+) diff --git a/config-powerpc64 b/config-powerpc64 index ae23e739b..b430449e0 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 93ee2b276..0e0d957ec 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 3859cf0cc..5ecd5e498 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -32,6 +32,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 6c913cec2..3adb447c2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2287,6 +2287,9 @@ fi # ||----w | # || || %changelog +* Tue Nov 19 2013 Josh Boyer +- Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984) + * Mon Nov 18 2013 Josh Boyer - Add patch to fix rhel5.9 KVM guests (rhbz 967652) - Add patches from Pierre Ossman to fix 24Hz/24p radeon audio (rhbz 1010679)