projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[powerpc.git]
/
arch
/
sparc64
/
kernel
/
sun4v_tlb_miss.S
diff --git
a/arch/sparc64/kernel/sun4v_tlb_miss.S
b/arch/sparc64/kernel/sun4v_tlb_miss.S
index
b731881
..
9871dbb
100644
(file)
--- a/
arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/
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