summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-08-26 11:08:07 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-08-26 11:08:07 +0100
commit6bebad469b89cf505b3a85154ce9468767eb1db4 (patch)
tree81c68fd2ca3d726ae4784462d906b1a2bab660cb /config-arm-generic
parentefcd02beae521c75ac0164de68f497b5eb7be8ff (diff)
downloadkernel-6bebad469b89cf505b3a85154ce9468767eb1db4.tar.gz
kernel-6bebad469b89cf505b3a85154ce9468767eb1db4.tar.xz
kernel-6bebad469b89cf505b3a85154ce9468767eb1db4.zip
Minor generic ARMv7 updates, Build tegra on both LPAE and general ARMv7 kernels (thank srwarren RHBZ 1110963), Set CMA to 64mb on LPAE kernel (RHBZ 1127000)
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index ac89eb201..9ddb1f0cc 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -8,6 +8,7 @@ CONFIG_HW_PERF_EVENTS=y
CONFIG_NFS_FS=y
CONFIG_CRASH=m
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_PID_IN_CONTEXTIDR is not set
@@ -46,6 +47,7 @@ CONFIG_ARM_CCN=y
CONFIG_ARM_DMA_USE_IOMMU=y
CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
CONFIG_ARM_GIC=y
+CONFIG_KVM_ARM_VGIC=y
CONFIG_ARM_GLOBAL_TIMER=y
CONFIG_ARM_SMMU=y
CONFIG_MMC_ARMMMCI=y