summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-01-26 23:51:41 +0000
committerjhb <jhb@FreeBSD.org>2001-01-26 23:51:41 +0000
commit5881492684e4bf26790431cd875ef127d86edff1 (patch)
treee57e2176c73fffbf265c1198e82cd558dd590619
parent17984f33e4584d275d877751d861a05e325e89bb (diff)
downloadFreeBSD-src-5881492684e4bf26790431cd875ef127d86edff1.zip
FreeBSD-src-5881492684e4bf26790431cd875ef127d86edff1.tar.gz
Fix fork_exit() to take a pointer to a function that returns void as its
first argument rather than a function that returns a void *. Noticed by: jake
-rw-r--r--sys/kern/kern_fork.c4
-rw-r--r--sys/sys/proc.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 8ad189e..2e2318f 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -643,7 +643,7 @@ rm_at_fork(function)
*/
void
fork_exit(callout, arg, frame)
- void *callout(void *, struct trapframe *);
+ void (*callout)(void *, struct trapframe *);
void *arg;
struct trapframe *frame;
{
@@ -666,7 +666,7 @@ fork_exit(callout, arg, frame)
* have this call a non-return function to stay in kernel mode.
* initproc has its own fork handler, but it does return.
*/
- (*callout)(arg, frame);
+ callout(arg, frame);
/*
* Check if a kernel thread misbehaved and returned from its main
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index b988887..b167444 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -505,7 +505,7 @@ int enterpgrp __P((struct proc *p, pid_t pgid, int mksess));
void faultin __P((struct proc *p));
void fixjobc __P((struct proc *p, struct pgrp *pgrp, int entering));
int fork1 __P((struct proc *, int, struct proc **));
-void fork_exit __P((void *(void *, struct trapframe *), void *,
+void fork_exit __P((void (*)(void *, struct trapframe *), void *,
struct trapframe *));
void fork_return __P((struct proc *, struct trapframe *));
int inferior __P((struct proc *p));
OpenPOWER on IntegriCloud