diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2004-06-13 21:49:30 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2004-06-13 21:49:30 +0000 |
| commit | 2dd254afa61a7c0cc5ae920b463d3d4266852804 (patch) | |
| tree | 7adbebef3be24ba910fd83ee1ba09e1577ae21a8 /sys/arch/vax | |
| parent | 4d62e331dcde739b4067d712dd602c0927ce11b3 (diff) | |
debranch SMP, have fun
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/vax/vax/genassym.cf | 5 | ||||
| -rw-r--r-- | sys/arch/vax/vax/subr.s | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index 03bd14a720d..a0df493ff3e 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.15 2003/11/10 21:05:06 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.16 2004/06/13 21:49:21 niklas Exp $ */ /* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */ /* @@ -88,7 +88,7 @@ extern int bootdev; * or after the current trap/syscall if in system mode. */ -#define need_resched(){ \ +#define need_resched(ci){ \ want_resched++; \ mtpr(AST_OK,PR_ASTLVL); \ } diff --git a/sys/arch/vax/vax/genassym.cf b/sys/arch/vax/vax/genassym.cf index 7e2b63bd89b..209fb80ecd1 100644 --- a/sys/arch/vax/vax/genassym.cf +++ b/sys/arch/vax/vax/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.4 2002/01/23 23:24:40 miod Exp $ +# $OpenBSD: genassym.cf,v 1.5 2004/06/13 21:49:22 niklas Exp $ # $NetBSD: genassym.cf,v 1.10 1999/11/19 22:09:55 ragge Exp $ # # Copyright (c) 1997 Ludd, University of Lule}, Sweden. @@ -48,6 +48,9 @@ struct proc member p_priority member p_addr member p_vmspace +member p_stat + +export SONPROC struct pcb member P0BR diff --git a/sys/arch/vax/vax/subr.s b/sys/arch/vax/vax/subr.s index 89d6e993326..0efb63df499 100644 --- a/sys/arch/vax/vax/subr.s +++ b/sys/arch/vax/vax/subr.s @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.s,v 1.19 2003/11/07 10:16:45 jmc Exp $ */ +/* $OpenBSD: subr.s,v 1.20 2004/06/13 21:49:22 niklas Exp $ */ /* $NetBSD: subr.s,v 1.32 1999/03/25 00:41:48 mrg Exp $ */ /* @@ -306,6 +306,7 @@ noque: .asciz "swtch" bbsc r3,_whichqs,2f # no, clear bit in whichqs 2: clrl 4(r2) # clear proc backpointer clrl _want_resched # we are now changing process + movb $SONPROC,P_STAT(r2) # p->p_stat = SONPROC movl r2,_curproc # set new process running cmpl r0,r2 # Same process? bneq 1f # No, continue |