diff options
| author | David S. Miller | 2008-04-24 12:15:22 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-04-24 12:15:22 +0200 |
| commit | 7697daaa894ca2bc5cd652269c316bcdc3ec441b (patch) | |
| tree | d95630c696f34d5bc2b0cb6ab69a812440187c36 /arch/sparc64/kernel/winfixup.S | |
| parent | [SPARC64]: Use trap type stored in pt_regs to handle syscall restart. (diff) | |
| download | kernel-qcow2-linux-7697daaa894ca2bc5cd652269c316bcdc3ec441b.tar.gz kernel-qcow2-linux-7697daaa894ca2bc5cd652269c316bcdc3ec441b.tar.xz kernel-qcow2-linux-7697daaa894ca2bc5cd652269c316bcdc3ec441b.zip | |
[SPARC64]: %l6 trap return handling no longer necessary.
Now that we indicate the "restart system call" in the
trap type field of pt_regs->magic, we don't need to
set the %l6 boolean in all of the trap return paths.
And we therefore don't need to pass it to do_notify_resume().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/winfixup.S')
| -rw-r--r-- | arch/sparc64/kernel/winfixup.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S index c4aa110a10e5..a6b0863c27df 100644 --- a/arch/sparc64/kernel/winfixup.S +++ b/arch/sparc64/kernel/winfixup.S @@ -32,7 +32,7 @@ fill_fixup: rd %pc, %g7 call do_sparc64_fault add %sp, PTREGS_OFF, %o0 - ba,pt %xcc, rtrap_clr_l6 + ba,pt %xcc, rtrap nop /* Be very careful about usage of the trap globals here. @@ -100,7 +100,7 @@ spill_fixup_dax: rd %pc, %g7 call do_sparc64_fault add %sp, PTREGS_OFF, %o0 - ba,a,pt %xcc, rtrap_clr_l6 + ba,a,pt %xcc, rtrap winfix_mna: andn %g3, 0x7f, %g3 @@ -122,12 +122,12 @@ fill_fixup_mna: mov %l4, %o2 call sun4v_do_mna mov %l5, %o1 - ba,a,pt %xcc, rtrap_clr_l6 + ba,a,pt %xcc, rtrap 1: mov %l4, %o1 mov %l5, %o2 call mem_address_unaligned nop - ba,a,pt %xcc, rtrap_clr_l6 + ba,a,pt %xcc, rtrap winfix_dax: andn %g3, 0x7f, %g3 @@ -150,7 +150,7 @@ fill_fixup_dax: add %sp, PTREGS_OFF, %o0 call sun4v_data_access_exception nop - ba,a,pt %xcc, rtrap_clr_l6 + ba,a,pt %xcc, rtrap 1: call spitfire_data_access_exception nop - ba,a,pt %xcc, rtrap_clr_l6 + ba,a,pt %xcc, rtrap |