diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2001-11-25 17:15:22 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2001-11-25 17:15:22 +0000 |
| commit | 303f90a786dd71a429859642caf95e25ef1a4888 (patch) | |
| tree | 6ee22e33e3f293d231d66537a8515d9edbcaee83 /sys/arch/m68k | |
| parent | 7cc59fc55a631022296b3de379370d2cebb5c5d4 (diff) | |
Harmonize userret() prototypes across m68k arches.
XXX The userret() code is not factorized out yet, as this will require
XXX insane amiga cleaning work.
Diffstat (limited to 'sys/arch/m68k')
| -rw-r--r-- | sys/arch/m68k/include/cpu.h | 7 | ||||
| -rw-r--r-- | sys/arch/m68k/m68k/m68k_machdep.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/m68k/include/cpu.h b/sys/arch/m68k/include/cpu.h index 2723dcb9169..5c1f46f081c 100644 --- a/sys/arch/m68k/include/cpu.h +++ b/sys/arch/m68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.6 2001/08/25 11:37:26 espie Exp $ */ +/* $OpenBSD: cpu.h,v 1.7 2001/11/25 17:15:19 miod Exp $ */ /* $NetBSD: cpu.h,v 1.3 1997/02/02 06:56:57 thorpej Exp $ */ /* @@ -205,6 +205,11 @@ u_long getsfc __P((void)); int fusword __P((caddr_t)); int susword __P((caddr_t, u_short)); +/* m68k_machdep.c */ +struct proc; +struct frame; +void userret __P((struct proc *, struct frame *, u_quad_t, u_int, int)); + /* regdump.c */ struct trapframe; void regdump __P((struct trapframe *, int)); diff --git a/sys/arch/m68k/m68k/m68k_machdep.c b/sys/arch/m68k/m68k/m68k_machdep.c index 287d064859f..aac99422534 100644 --- a/sys/arch/m68k/m68k/m68k_machdep.c +++ b/sys/arch/m68k/m68k/m68k_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m68k_machdep.c,v 1.2 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: m68k_machdep.c,v 1.3 2001/11/25 17:15:19 miod Exp $ */ /* $NetBSD: m68k_machdep.c,v 1.3 1997/06/12 09:57:04 veego Exp $ */ /*- @@ -48,11 +48,8 @@ /* the following is used externally (sysctl_hw) */ char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */ -void userret __P((struct proc *, int, u_quad_t)); /* XXX */ /* * Process the tail end of a fork() for the child - * - * XXX - this is probably the wrong file. */ void child_return(arg) @@ -65,7 +62,7 @@ child_return(arg) f->f_sr &= ~PSL_C; /* carry bit */ f->f_format = FMT0; - userret(p, f->f_pc, p->p_sticks); + userret(p, f, p->p_sticks, 0, 0); #ifdef KTRACE if (KTRPOINT(p, KTR_SYSRET)) ktrsysret(p, SYS_fork, 0, 0); |