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/mm | |
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/mm')
-rw-r--r-- | arch/sparc64/mm/ultra.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 2865c105b6a4..e686a67561af 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
@@ -476,7 +476,6 @@ xcall_sync_tick: | |||
476 | #endif | 476 | #endif |
477 | call smp_synchronize_tick_client | 477 | call smp_synchronize_tick_client |
478 | nop | 478 | nop |
479 | clr %l6 | ||
480 | b rtrap_xcall | 479 | b rtrap_xcall |
481 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 480 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
482 | 481 | ||
@@ -511,7 +510,6 @@ xcall_report_regs: | |||
511 | #endif | 510 | #endif |
512 | call __show_regs | 511 | call __show_regs |
513 | add %sp, PTREGS_OFF, %o0 | 512 | add %sp, PTREGS_OFF, %o0 |
514 | clr %l6 | ||
515 | /* Has to be a non-v9 branch due to the large distance. */ | 513 | /* Has to be a non-v9 branch due to the large distance. */ |
516 | b rtrap_xcall | 514 | b rtrap_xcall |
517 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 515 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
@@ -576,7 +574,7 @@ __hypervisor_tlb_xcall_error: | |||
576 | mov %l4, %o0 | 574 | mov %l4, %o0 |
577 | call hypervisor_tlbop_error_xcall | 575 | call hypervisor_tlbop_error_xcall |
578 | mov %l5, %o1 | 576 | mov %l5, %o1 |
579 | ba,a,pt %xcc, rtrap_clr_l6 | 577 | ba,a,pt %xcc, rtrap |
580 | 578 | ||
581 | .globl __hypervisor_xcall_flush_tlb_mm | 579 | .globl __hypervisor_xcall_flush_tlb_mm |
582 | __hypervisor_xcall_flush_tlb_mm: /* 21 insns */ | 580 | __hypervisor_xcall_flush_tlb_mm: /* 21 insns */ |