diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2015-10-09 16:56:41 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:26 +0800 |
| commit | 858610fec350a708a6e5de46d6840bbd96920dc4 (patch) | |
| tree | 09d755e5fd2978d9542fa9d2d09595a015112886 /arch/arm | |
| parent | cd6257877624d3214c4d58745e73fdf54943c5aa (diff) | |
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 <shengjiu.wang@freescale.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 00a402eeccf0..7ab4a2d5d84b 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -27,6 +27,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_VMSPLIT_2G=y CONFIG_ARM_PSCI=y diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 50e0b45a22db..95dc7300b2ac 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -719,7 +719,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 |