diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-24 06:15:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-24 06:15:22 -0400 |
commit | 7697daaa894ca2bc5cd652269c316bcdc3ec441b (patch) | |
tree | d95630c696f34d5bc2b0cb6ab69a812440187c36 /arch/sparc64/kernel/winfixup.S | |
parent | 238468b2ac76020c192a7402c92df5097916bf4a (diff) |
[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: | |||
32 | rd %pc, %g7 | 32 | rd %pc, %g7 |
33 | call do_sparc64_fault | 33 | call do_sparc64_fault |
34 | add %sp, PTREGS_OFF, %o0 | 34 | add %sp, PTREGS_OFF, %o0 |
35 | ba,pt %xcc, rtrap_clr_l6 | 35 | ba,pt %xcc, rtrap |
36 | nop | 36 | nop |
37 | 37 | ||
38 | /* Be very careful about usage of the trap globals here. | 38 | /* Be very careful about usage of the trap globals here. |
@@ -100,7 +100,7 @@ spill_fixup_dax: | |||
100 | rd %pc, %g7 | 100 | rd %pc, %g7 |
101 | call do_sparc64_fault | 101 | call do_sparc64_fault |
102 | add %sp, PTREGS_OFF, %o0 | 102 | add %sp, PTREGS_OFF, %o0 |
103 | ba,a,pt %xcc, rtrap_clr_l6 | 103 | ba,a,pt %xcc, rtrap |
104 | 104 | ||
105 | winfix_mna: | 105 | winfix_mna: |
106 | andn %g3, 0x7f, %g3 | 106 | andn %g3, 0x7f, %g3 |
@@ -122,12 +122,12 @@ fill_fixup_mna: | |||
122 | mov %l4, %o2 | 122 | mov %l4, %o2 |
123 | call sun4v_do_mna | 123 | call sun4v_do_mna |
124 | mov %l5, %o1 | 124 | mov %l5, %o1 |
125 | ba,a,pt %xcc, rtrap_clr_l6 | 125 | ba,a,pt %xcc, rtrap |
126 | 1: mov %l4, %o1 | 126 | 1: mov %l4, %o1 |
127 | mov %l5, %o2 | 127 | mov %l5, %o2 |
128 | call mem_address_unaligned | 128 | call mem_address_unaligned |
129 | nop | 129 | nop |
130 | ba,a,pt %xcc, rtrap_clr_l6 | 130 | ba,a,pt %xcc, rtrap |
131 | 131 | ||
132 | winfix_dax: | 132 | winfix_dax: |
133 | andn %g3, 0x7f, %g3 | 133 | andn %g3, 0x7f, %g3 |
@@ -150,7 +150,7 @@ fill_fixup_dax: | |||
150 | add %sp, PTREGS_OFF, %o0 | 150 | add %sp, PTREGS_OFF, %o0 |
151 | call sun4v_data_access_exception | 151 | call sun4v_data_access_exception |
152 | nop | 152 | nop |
153 | ba,a,pt %xcc, rtrap_clr_l6 | 153 | ba,a,pt %xcc, rtrap |
154 | 1: call spitfire_data_access_exception | 154 | 1: call spitfire_data_access_exception |
155 | nop | 155 | nop |
156 | ba,a,pt %xcc, rtrap_clr_l6 | 156 | ba,a,pt %xcc, rtrap |