diff options
| author | davem <davem> | 2001-12-24 04:33:02 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-24 04:33:02 +0000 |
| commit | 46bc6e8d456c43c1916cc4750cc6de3383f9e523 (patch) | |
| tree | 32570c9428e9bce45c79e600a5c2786b0828b2f8 | |
| parent | 40f2773d5410f84339a72fb39b8b1cf540df94e7 (diff) | |
| download | netdev-vger-cvs-46bc6e8d456c43c1916cc4750cc6de3383f9e523.tar.gz | |
Remove erroneous branch in __handle_user_windows.
Noticed by Kanoj.
| -rw-r--r-- | arch/sparc64/kernel/rtrap.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index f06dd499c..71d071141 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S @@ -1,4 +1,4 @@ -/* $Id: rtrap.S,v 1.57 2001-12-06 00:16:11 davem Exp $ +/* $Id: rtrap.S,v 1.58 2001-12-24 04:33:02 davem Exp $ * rtrap.S: Preparing for return from trap on Sparc V9. * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -40,8 +40,7 @@ __handle_preemption: __handle_user_windows: call fault_in_user_windows wrpr %g0, RTRAP_PSTATE, %pstate - ba,pt %xcc, __handle_user_windows_continue - wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate + wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate /* Redo sched+sig checks */ ldx [%g6 + AOFF_task_need_resched], %l0 brz,pt %l0, 1f |