---

yaml --- r: 21470 b: refs/heads/master c: 3d6395c h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · a582890 · a582890
1 parent 3afd628
commit a582890
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 135066a21129760e44a51a7ef31d8c861f8ddace
+refs/heads/master: 3d6395cb770b0db9135a853b1742418c99ed2148
diff --git a/trunk/arch/sparc64/kernel/etrap.S b/trunk/arch/sparc64/kernel/etrap.S
@@ -188,6 +188,11 @@ etraptl1:	/* Save tstate/tpc/tnpc of TL 1-->4 and the tl register itself.
 		rdpr	%tt, %g3
 		stx	%g3, [%g2 + STACK_BIAS + 0x38]
 
+		sethi	%hi(is_sun4v), %g3
+		lduw	[%g3 + %lo(is_sun4v)], %g3
+		brnz,pn	%g3, finish_tl1_capture
+		 nop
+
 		wrpr	%g0, 3, %tl
 		rdpr	%tstate, %g3
 		stx	%g3, [%g2 + STACK_BIAS + 0x40]
@@ -210,6 +215,7 @@ etraptl1:	/* Save tstate/tpc/tnpc of TL 1-->4 and the tl register itself.
 
 		stx	%g1, [%g2 + STACK_BIAS + 0x80]
 
+finish_tl1_capture:
 		wrpr	%g0, 1, %tl
 661:		nop
 		.section .sun4v_1insn_patch, "ax"

diff --git a/trunk/arch/sparc64/kernel/traps.c b/trunk/arch/sparc64/kernel/traps.c
@@ -73,10 +73,12 @@ struct tl1_traplog {
 
 static void dump_tl1_traplog(struct tl1_traplog *p)
 {
-	int i;
+	int i, limit;
 
 	printk("TRAPLOG: Error at trap level 0x%lx, dumping track stack.\n",
 	       p->tl);
+
+	limit = (tlb_type == hypervisor) ? 2 : 4;
 	for (i = 0; i < 4; i++) {
 		printk(KERN_CRIT
 		       "TRAPLOG: Trap level %d TSTATE[%016lx] TPC[%016lx] "