From: Bob Liu <lliubbo@gmail.com>
Date: Tue, 17 Jan 2012 10:06:34 +0000 (+0800)
Subject: blackfin: bf561: forgot CSYNC in get_core_lock_noflush
X-Git-Tag: MMI-PSA29.97-13-9~17216^2~17
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5e0d8652adfc0530b3fce18e54e429287aeee73;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

blackfin: bf561: forgot CSYNC in get_core_lock_noflush

SMP kgdb runs into dead loop without this CSYNC when one core single
steps over get_core_lock_noflush and the other executes get_core_lock
as a slave node.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
---

diff --git a/arch/blackfin/mach-bf561/atomic.S b/arch/blackfin/mach-bf561/atomic.S
index 52d6f73fcced..2a08df8e8c4c 100644
--- a/arch/blackfin/mach-bf561/atomic.S
+++ b/arch/blackfin/mach-bf561/atomic.S
@@ -72,6 +72,13 @@ ENTRY(_get_core_lock_noflush)
 	SSYNC(r2);
 	jump .Lretry_corelock_noflush
 .Ldone_corelock_noflush:
+	/*
+	 * SMP kgdb runs into dead loop without NOP here, when one core
+	 * single steps over get_core_lock_noflush and the other executes
+	 * get_core_lock as a slave node.
+	 */
+	nop;
+	CSYNC(r2);
 	rts;
 ENDPROC(_get_core_lock_noflush)