From 19d658534934710fbc8a3699426f0eedf8130d43 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 26 Jan 2007 19:39:40 -0800 Subject: [PATCH] --- yaml --- r: 45890 b: refs/heads/master c: 7d620a4e531ae4d432d3c88f7d4b75327d881a87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/sun4v_tlb_miss.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2eb862d8c091..03e6fcb07a0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 095b8501e4168ae5a879fcb9420ac48cbd43f95a +refs/heads/master: 7d620a4e531ae4d432d3c88f7d4b75327d881a87 diff --git a/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S b/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S index b731881224e8..9871dbb1ab42 100644 --- a/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S +++ b/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S @@ -142,9 +142,9 @@ sun4v_dtlb_prot: rdpr %tl, %g1 cmp %g1, 1 bgu,pn %xcc, winfix_trampoline - nop - ba,pt %xcc, sparc64_realfault_common mov FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4 + ba,pt %xcc, sparc64_realfault_common + nop /* Called from trap table: * %g4: vaddr