From: Catalin Marinas Date: Sun, 2 Oct 2005 21:34:35 +0000 (+0100) Subject: [ARM] 2943/1: Clear the exclusive monitor in v6_early_abort X-Git-Tag: v2.6.14-rc4~86^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c3a0540999ac9bd7147fb98833224a58cdaf217;p=linux-2.6-omap-h63xx.git [ARM] 2943/1: Clear the exclusive monitor in v6_early_abort Patch from Catalin Marinas Data abort caused by ldrex/strex can leave the exclusive monitor in an unpredictable state. It is recommended that a clrex/strex is performed to clear this state. Signed-off-by: Catalin Marinas Signed-off-by: Russell King --- diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index 8f76f3df7b4..dbd34603312 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S @@ -20,6 +20,11 @@ */ .align 5 ENTRY(v6_early_abort) +#ifdef CONFIG_CPU_MPCORE + clrex +#else + strex r0, r1, [sp] @ Clear the exclusive monitor +#endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR /*