Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14164876 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: ARM_KERNMEM_PERMS and STACKPROTECTOR_STRONG for 8909w"

parents af87c894 3eb4175e

arch/arm/configs/msm8909w-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_SLUB_DEBUG is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_ARCH_MMAP_RND_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -40,6 +40,7 @@ CONFIG_MODVERSIONS=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8909=y

CONFIG_ARM_KERNMEM_PERMS=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y

arch/arm/configs/msm8909w_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ CONFIG_EMBEDDED=y 
CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_ARCH_MMAP_RND_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -42,6 +42,7 @@ CONFIG_MODULE_SIG_SHA512=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8909=y

CONFIG_ARM_KERNMEM_PERMS=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y