---

yaml --- r: 293950 b: refs/heads/master c: a5e0d86 h: refs/heads/master v: v3
git-mirror · Mar 21, 2012 · 2ba0592 · 2ba0592
1 parent 9cb6b55
commit 2ba0592
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d002cce4c8a24234b81033119eda3272ebf7981
+refs/heads/master: a5e0d8652adfc0530b3fce18e54e429287aeee73
diff --git a/trunk/arch/blackfin/mach-bf561/atomic.S b/trunk/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)