diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-08 13:02:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 13:02:16 +0200 |
| commit | 8e8c668927b029f6ccc350eb1aa936864cc4eb6f (patch) | |
| tree | f91ec6d49e2b01de5b4b3d517209d13b216a3f0f /arch/sparc/kernel/utrap.S | |
| parent | f0133acc7d4835cfbb86393b7d2a4fba7519585b (diff) | |
| parent | 970442c599b22ccd644ebfe94d1d303bf6f87c05 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/kernel/utrap.S')
| -rw-r--r-- | arch/sparc/kernel/utrap.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/utrap.S b/arch/sparc/kernel/utrap.S index b7f0f3f3a909..c731e8023d3e 100644 --- a/arch/sparc/kernel/utrap.S +++ b/arch/sparc/kernel/utrap.S @@ -11,8 +11,7 @@ utrap_trap: /* %g3=handler,%g4=level */ 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 |