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/m88k | |
| parent | 4d62e331dcde739b4067d712dd602c0927ce11b3 (diff) | |
debranch SMP, have fun
Diffstat (limited to 'sys/arch/m88k')
| -rw-r--r-- | sys/arch/m88k/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/genassym.cf | 5 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/process.S | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h index 213c4a7d672..992d11f0cb5 100644 --- a/sys/arch/m88k/include/cpu.h +++ b/sys/arch/m88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.2 2004/06/13 21:49:17 niklas Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -103,7 +103,7 @@ extern int want_ast; * or after the current trap/syscall if in system mode. */ extern int want_resched; /* resched() was called */ -#define need_resched() (want_resched = 1, want_ast = 1) +#define need_resched(ci) (want_resched = 1, want_ast = 1) /* * Give a profiling tick to the current process when the user profiling diff --git a/sys/arch/m88k/m88k/genassym.cf b/sys/arch/m88k/m88k/genassym.cf index 9c7329013c3..1f533586cd7 100644 --- a/sys/arch/m88k/m88k/genassym.cf +++ b/sys/arch/m88k/m88k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.1 2004/04/29 14:33:27 miod Exp $ +# $OpenBSD: genassym.cf,v 1.2 2004/06/13 21:49:17 niklas Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)genassym.c 7.8 (Berkeley) 5/7/91 -# $Id: genassym.cf,v 1.1 2004/04/29 14:33:27 miod Exp $ +# $Id: genassym.cf,v 1.2 2004/06/13 21:49:17 niklas Exp $ # include <sys/param.h> @@ -53,6 +53,7 @@ member p_stat member p_wchan export SRUN +export SONPROC # general constants export UPAGES diff --git a/sys/arch/m88k/m88k/process.S b/sys/arch/m88k/m88k/process.S index 9c460e544da..aef28aca221 100644 --- a/sys/arch/m88k/m88k/process.S +++ b/sys/arch/m88k/m88k/process.S @@ -1,4 +1,4 @@ -/* $OpenBSD: process.S,v 1.1 2004/04/29 14:33:27 miod Exp $ */ +/* $OpenBSD: process.S,v 1.2 2004/06/13 21:49:17 niklas Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -215,6 +215,8 @@ ASLOCAL(Ldoneloop) or.u r11, r0, hi16(_C_LABEL(curproc)) st r9, r11,lo16(_C_LABEL(curproc)) /* curproc = p */ + or r2, r0, SONPROC + st.b r2, r9, P_STAT /* r9 is curproc */ st r0, r9, P_BACK /* p->p_back = 0 */ |