summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-09-09 23:17:26 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-09-09 23:17:26 +0100
commit8da75d6b6c9c162ec4602f2fee79cf7a2352b53d (patch)
tree80e40bc30bcfd2910c4f0650b8b8fbbfcdb574d9
parentef211b5b1781af89bcb982dfaa60c4583ce7ad28 (diff)
downloadkernel-8da75d6b6c9c162ec4602f2fee79cf7a2352b53d.tar.gz
kernel-8da75d6b6c9c162ec4602f2fee79cf7a2352b53d.tar.xz
kernel-8da75d6b6c9c162ec4602f2fee79cf7a2352b53d.zip
Enable OF option to allocate CMA memory using device tree on ARM
-rw-r--r--config-armv7-generic4
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 2 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index c41eb2b0a..b3d16473a 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -368,8 +368,8 @@ CONFIG_LEDS_DAC124S085=m
CONFIG_LEDS_PWM=m
CONFIG_BMP085_SPI=m
-# Display
-
+# Contiguous Memory Allocator
+CONFIG_OF_RESERVED_MEM=y
CONFIG_CMA=y
CONFIG_DMA_CMA=y
# CONFIG_CMA_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index ee8fa6cd5..350085568 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2297,6 +2297,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Sep 9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable OF option to allocate CMA memory using device tree on ARM
+
* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git17.1
- Linux fscache-fixes-for-ceph-8429-g300893b