On 12/16/2016 11:45 PM, Sam Ravnborg wrote: > Hi Mike > >> diff --git a/arch/sparc/kernel/fpu_traps.S b/arch/sparc/kernel/fpu_traps.S >> index 336d275..f85a034 100644 >> --- a/arch/sparc/kernel/fpu_traps.S >> +++ b/arch/sparc/kernel/fpu_traps.S >> @@ -73,6 +73,16 @@ do_fpdis: >> ldxa [%g3] ASI_MMU, %g5 >> .previous >> >> +661: nop >> + nop >> + .section .sun4v_2insn_patch, "ax" >> + .word 661b >> + mov SECONDARY_CONTEXT_R1, %g3 >> + ldxa [%g3] ASI_MMU, %g4 >> + .previous >> + /* Unnecessary on sun4u and pre-Niagara 2 sun4v */ >> + mov SECONDARY_CONTEXT, %g3 >> + >> sethi %hi(sparc64_kern_sec_context), %g2 > > You missed the second instruction to patch with here. > This bug repeats itself further down. > > Just noted while briefly reading the code - did not really follow the code. Hi Sam, This is my first sparc assembly code, so I could certainly have this wrong. The code I was trying to write has the two nop instructions, that get patched with the mov and ldxa on sun4v. Certainly, this is not elegant. And, the formatting may lead to some confusion. Did you perhaps think the mov instruction after the comment was for patching? I am just trying to understand your comment. -- Mike Kravetz -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
