---

yaml
---
r: 108351
b: refs/heads/master
c: c749808
h: refs/heads/master
i:
  108349: 916abf4
  108347: ae6e213
  108343: 47ca4e5
  108335: 9b967ba
  108319: 2c3fe60
  108287: 047cb3e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ed413ddcfb66e9d3e1318060271391c7659dd3
+refs/heads/master: c7498081a6f5d96c9f3243b6b5e020352903bfd2

trunk/arch/sparc64/lib/mcount.S

@@ -48,12 +48,23 @@ mcount:
 	sub		%g3, STACK_BIAS, %g3
 	cmp		%sp, %g3
 	bg,pt		%xcc, 1f
-	 sethi		%hi(panicstring), %g3
+	 nop
+	/* If we are already on ovstack, don't hop onto it
+	 * again, we are already trying to output the stack overflow
+	 * message.
+	 */
 	sethi		%hi(ovstack), %g7		! cant move to panic stack fast enough
 	 or		%g7, %lo(ovstack), %g7
-	add		%g7, OVSTACKSIZE, %g7
+	add		%g7, OVSTACKSIZE, %g3
+	sub		%g3, STACK_BIAS + 192, %g3
 	sub		%g7, STACK_BIAS, %g7
-	mov		%g7, %sp
+	cmp		%sp, %g7
+	blu,pn		%xcc, 2f
+	 cmp		%sp, %g3
+	bleu,pn		%xcc, 1f
+	 nop
+2:	mov		%g3, %sp
+	sethi		%hi(panicstring), %g3
 	call		prom_printf
 	 or		%g3, %lo(panicstring), %o0
 	call		prom_halt