summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-11-10 10:17:55 -0800
committerLaura Abbott <labbott@fedoraproject.org>2015-11-10 10:17:55 -0800
commitf3a8851575e5e1436910baa1a26a012f2c81fd38 (patch)
tree11b2328c2f1685daec7dc5b3d5f1823e8ace610e
parent2f9a713ebd864d630671aac640ee162e61045a01 (diff)
downloadkernel-f3a8851575e5e1436910baa1a26a012f2c81fd38.tar.gz
kernel-f3a8851575e5e1436910baa1a26a012f2c81fd38.tar.xz
kernel-f3a8851575e5e1436910baa1a26a012f2c81fd38.zip
Enable CONFIG_CMA on x86_64 (rhbz 1278985)
-rw-r--r--config-x86_64-generic6
-rw-r--r--kernel.spec3
2 files changed, 9 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 76a5beba1..1131aa0ec 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -210,3 +210,9 @@ CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_FULL_ALL is not set
# CONFIG_NO_HZ_FULL_SYSIDLE is not set
# CONFIG_CONTEXT_TRACKING_FORCE is not set
+
+# Turn on CONFIG_CMA for THP
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
diff --git a/kernel.spec b/kernel.spec
index e4d97b226..0e3df4ad8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2048,6 +2048,9 @@ fi
#
#
%changelog
+* Tue Nov 10 2015 Laura Abbott <labbott@redhat.com>
+- Enable CONFIG_CMA on x86_64 (rhbz 1278985)
+
* Tue Nov 10 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git6.1
- Linux v4.3-9393-gbd4f203