patch-2.4.6 linux/arch/sparc/kernel/rtrap.S
Next file: linux/arch/sparc/vmlinux.lds
Previous file: linux/arch/sparc/config.in
Back to the patch index
Back to the overall index
- Lines: 18
- Date:
Tue Jun 12 11:08:46 2001
- Orig file:
v2.4.5/linux/arch/sparc/kernel/rtrap.S
- Orig date:
Sun Aug 6 11:43:17 2000
diff -u --recursive --new-file v2.4.5/linux/arch/sparc/kernel/rtrap.S linux/arch/sparc/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.55 2000/08/05 10:48:40 davem Exp $
+/* $Id: rtrap.S,v 1.56 2001/06/05 09:56:06 davem Exp $
* rtrap.S: Return from Sparc trap low-level code.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -52,9 +52,8 @@
sll %l3, 5, %l3
sethi %hi(C_LABEL(irq_stat)), %l4 ! &softirq_active
add %l4, %l3, %l4
- ld [%l4 + %lo(C_LABEL(irq_stat))], %g5 ! softirq_active
- ld [%l4 + %lo(C_LABEL(irq_stat) + 4)], %g4 ! softirq_mask
- andcc %g4, %g5, %g0
+ ld [%l4 + %lo(C_LABEL(irq_stat))], %g5 ! softirq_pending
+ cmp %g5, 0
be C_LABEL(ret_trap_lockless_ipi)
nop
call C_LABEL(do_softirq)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)