From 49b832af518259ea2aba3c61ff45dd49c877d7d8 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Fri, 9 Oct 2015 16:56:41 +0800 Subject: [PATCH] MLK-11676 ARM: imx_v7_defconfig: disable CONFIG_SWP_EMULATE According to the help text in the config SWP_EMULATE in arch/arm/mm/Kconfig: "In some older versions of glibc [<=2.8] SWP is used during futex trylock() operations with the assumption that the code will not be preempted. This invalid assumption may be more likely to fail with SWP emulation enabled, leading to deadlock of the user application." The audio codec toolchain version is gcc-4.1.1-glibc-2.4, we need turn off the CONFIG_SWP_EMULATE in the imx_v7_defconfig. Signed-off-by: Shengjiu Wang Signed-off-by: Vipul Kumar --- arch/arm/configs/imx_v7_defconfig | 1 + arch/arm/mm/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 35c79e6275ea..e0a8f01a2685 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -28,6 +28,7 @@ CONFIG_SOC_IMX6ULL=y CONFIG_SOC_IMX7D=y CONFIG_SOC_IMX6SLL=y CONFIG_SOC_VF610=y +# CONFIG_SWP_EMULATE is not set CONFIG_SMP=y CONFIG_VMSPLIT_2G=y CONFIG_ARM_PSCI=y diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index b169e580bf82..e6844c3774b4 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -713,7 +713,7 @@ config ARM_VIRT_EXT details. config SWP_EMULATE - bool "Emulate SWP/SWPB instructions" if !SMP + bool "Emulate SWP/SWPB instructions" depends on CPU_V7 default y if SMP select HAVE_PROC_CPU if PROC_FS -- 2.17.1