From c2b3e71449b7af286794386c42dd5e536aaa61bc Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 2 Mar 2009 22:39:36 +0100 Subject: [PATCH] --- yaml --- r: 131994 b: refs/heads/master c: 25ef4a67e78e1322d55f0a38783537ed89addc02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/abort-ev6.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2213be305bb4..0c888dd21701 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8532db7f2661b63f658b9a08cf4053a3e6abb78 +refs/heads/master: 25ef4a67e78e1322d55f0a38783537ed89addc02 diff --git a/trunk/arch/arm/mm/abort-ev6.S b/trunk/arch/arm/mm/abort-ev6.S index 8a7f65ba14b7..94077fbd96b7 100644 --- a/trunk/arch/arm/mm/abort-ev6.S +++ b/trunk/arch/arm/mm/abort-ev6.S @@ -23,7 +23,8 @@ ENTRY(v6_early_abort) #ifdef CONFIG_CPU_32v6K clrex #else - strex r0, r1, [sp] @ Clear the exclusive monitor + sub r1, sp, #4 @ Get unused stack location + strex r0, r1, [r1] @ Clear the exclusive monitor #endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR