diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-19 08:06:59 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-19 08:06:59 -0500 |
| commit | d59a2da31b4513890279feeed5dbaba3efa7c1d9 (patch) | |
| tree | b531aeab2f752e39664bd226b8ca55c880ed6e3d | |
| parent | d6f9b4091186adafb1fa14fa71b76423c6389466 (diff) | |
| download | kernel-d59a2da31b4513890279feeed5dbaba3efa7c1d9.tar.gz kernel-d59a2da31b4513890279feeed5dbaba3efa7c1d9.tar.xz kernel-d59a2da31b4513890279feeed5dbaba3efa7c1d9.zip | |
Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984)
| -rw-r--r-- | config-powerpc64 | 2 | ||||
| -rw-r--r-- | config-powerpc64p7 | 2 | ||||
| -rw-r--r-- | config-x86_64-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/config-powerpc64 b/config-powerpc64 index 3d4bc1532..f4bb2def4 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -99,6 +99,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 c0f8d9e0f..be3abe582 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -90,6 +90,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 e48ef4503..e007e5431 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -33,6 +33,7 @@ CONFIG_SWIOTLB=y # CONFIG_GART_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 559797dd2..72ced16de 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2215,6 +2215,9 @@ fi # ||----w | # || || %changelog +* Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org> +- Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984) + * Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git8.1 - Linux v3.12-10554-g801a760 |