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

Commit 71a45015 authored Jan 05, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 05, 2014

Merge "defconfig: re-enable CONFIG_STRICT_MEMORY_RWX for 8084"

parents 1460e60c b258d9ae

arch/arm/configs/apq8084-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ CONFIG_MSM_HSIC_SYSMON=y
		CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_ARM_LPAE=y
		CONFIG_STRICT_MEMORY_RWX=y
		CONFIG_PCI=y
		CONFIG_PCI_MSI=y
		CONFIG_SMP=y

arch/arm/configs/apq8084_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ CONFIG_MSM_HSIC_SYSMON=y
		CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_ARM_LPAE=y
		CONFIG_STRICT_MEMORY_RWX=y
		CONFIG_PCI=y
		CONFIG_PCI_MSI=y
		CONFIG_SMP=y