--- zzzz-none-000/linux-3.10.107/arch/sparc/kernel/utrap.S 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/arch/sparc/kernel/utrap.S 2021-02-04 17:41:59.000000000 +0000 @@ -11,8 +11,7 @@ mov %l4, %o1 call bad_trap add %sp, PTREGS_OFF, %o0 - ba,pt %xcc, rtrap - nop + ba,a,pt %xcc, rtrap invoke_utrap: sllx %g3, 3, %g3