From: Shengjiu Wang Date: Fri, 9 Oct 2015 08:56:41 +0000 (+0800) Subject: MLK-11676 ARM: imx_v7_defconfig: disable CONFIG_SWP_EMULATE X-Git-Tag: C0P2-H0.0--20200415~4195 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3be313e3416411be48fab8c1e9704e75b58f1cf6;p=linux.git 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 --- diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index a37c6cb17279..bbc0c89096a0 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -25,6 +25,7 @@ CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y CONFIG_SOC_VF610=y +# CONFIG_SWP_EMULATE is not set CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_VMSPLIT_2G=y diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c1799dd1d0d9..aa7d512aaffc 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -692,7 +692,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