diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2008-04-27 15:59:50 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2008-04-27 15:59:50 +0000 |
| commit | 5788a8af1750cfa41066856b1ecabf16211465dc (patch) | |
| tree | 836d8765ed9dbe425f9895485acaa1f8c9c6c6de /sys/arch/macppc | |
| parent | 8e3761937e5618f04a59f1905927d77f51b95be8 (diff) | |
Switch to proc based ast pending for SMP. ok kettenis.
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/macppc/genassym.cf | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/locore.S | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf index 9e1f850e0e5..78f4defa294 100644 --- a/sys/arch/macppc/macppc/genassym.cf +++ b/sys/arch/macppc/macppc/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.16 2007/12/04 22:36:39 kettenis Exp $ +# $OpenBSD: genassym.cf,v 1.17 2008/04/27 15:59:49 drahn Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -72,6 +72,7 @@ struct proc member p_addr member p_stat member p_cpu +member P_MD_ASTPENDING p_md.md_astpending struct sigframe member sf_sc @@ -84,7 +85,6 @@ struct cpu_info member ci_curproc member ci_curpcb member ci_curpm -member ci_astpending member ci_want_resched member ci_cpl member ci_intrdepth diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S index ab873201e58..a70c8d1e14f 100644 --- a/sys/arch/macppc/macppc/locore.S +++ b/sys/arch/macppc/macppc/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.37 2008/04/26 22:37:41 drahn Exp $ */ +/* $OpenBSD: locore.S,v 1.38 2008/04/27 15:59:49 drahn Exp $ */ /* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */ /* @@ -920,7 +920,8 @@ trapexit: mtcr %r5 bc 4,17,1f /* branch if PSL_PR is false */ GET_CPUINFO(%r3) - lwz %r4,CI_ASTPENDING(%r3) + lwz %r4,CI_CURPROC(%r3) + lwz %r4,P_MD_ASTPENDING(%r4) andi. %r4,%r4,1 beq 1f li %r6,EXC_AST @@ -1151,7 +1152,8 @@ intr_exit: lwz %r4,52(3); mtsr 13,%r4; lwz %r4,56(3); mtsr 14,%r4; lwz %r4,60(3); mtsr 15,%r4; - lwz %r4,CI_ASTPENDING(%r5) /* Test AST pending */ + lwz %r4,CI_CURPROC(%r5) + lwz %r4,P_MD_ASTPENDING(%r4) /* Test AST pending */ andi. %r4,%r4,1 beq 1f /* Setup for entry to realtrap: */ |