Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softintr_ret: fix it to work properly after yesterday's change to mi_switch.

This commit is contained in:
ad 2007-12-04 08:03:46 +00:00
parent a33059bb24
commit 7546fcf0ad
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/amd64/amd64/spl.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: spl.S,v 1.13 2007/12/03 15:33:10 ad Exp $ */ /* $NetBSD: spl.S,v 1.14 2007/12/04 08:03:46 ad Exp $ */
/* /*
* Copyright (c) 2003 Wasabi Systems, Inc. * Copyright (c) 2003 Wasabi Systems, Inc.
@ -133,6 +133,7 @@ IDTVEC(softintr)
* %rax prevlwp from cpu_switchto() * %rax prevlwp from cpu_switchto()
*/ */
NENTRY(softintr_ret) NENTRY(softintr_ret)
incl CPUVAR(MTX_COUNT) /* re-adjust after mi_switch */
movl $0, L_CTXSWTCH(%rax) /* %rax from cpu_switchto */ movl $0, L_CTXSWTCH(%rax) /* %rax from cpu_switchto */
cli cli
jmp *%r13 /* back to splx/doreti */ jmp *%r13 /* back to splx/doreti */

3
sys/arch/i386/i386/spl.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: spl.S,v 1.21 2007/12/03 15:33:46 ad Exp $ */ /* $NetBSD: spl.S,v 1.22 2007/12/04 08:03:46 ad Exp $ */
/* /*
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@ -313,6 +313,7 @@ IDTVEC(softintr)
* %eax prevlwp from cpu_switchto() * %eax prevlwp from cpu_switchto()
*/ */
NENTRY(softintr_ret) NENTRY(softintr_ret)
incl CPUVAR(MTX_COUNT) /* re-adjust after mi_switch */
movl $0, L_CTXSWTCH(%eax) /* %eax from cpu_switchto */ movl $0, L_CTXSWTCH(%eax) /* %eax from cpu_switchto */
cli cli
jmp *%esi /* back to splx/doreti */ jmp *%esi /* back to splx/doreti */