Build failures in compat/svr4 module due to do_sys_wait (+ fix?)

View: New views
3 Messages — Rating Filter:   Alert me  

Build failures in compat/svr4 module due to do_sys_wait (+ fix?)

by Rafal Boni :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

The current kernel fails to build when build the SVR4 compat module (if
it's enabled in the config file; I suspect the module build fails the
same way):

cc1: warnings being treated as errors
/extra/netbsd-src/current/sys/compat/svr4/svr4_misc.c: In function 'svr4_sys_wai
tsys':
/extra/netbsd-src/current/sys/compat/svr4/svr4_misc.c:1041: warning: passing arg
ument 1 of 'do_sys_wait' from incompatible pointer type
/extra/netbsd-src/current/sys/compat/svr4/svr4_misc.c:1041: warning: passing arg
ument 3 of 'do_sys_wait' makes integer from pointer without a cast
/extra/netbsd-src/current/sys/compat/svr4/svr4_misc.c:1041: warning: passing arg
ument 4 of 'do_sys_wait' makes pointer from integer without a cast
/extra/netbsd-src/current/sys/compat/svr4/svr4_misc.c:1041: error: too many argu
ments to function 'do_sys_wait'

The following looks like it might fix that, though I haven't yet verified:

diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 36fb641..d8de142 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -1037,8 +1037,7 @@ svr4_sys_waitsys(struct lwp *l, const struct svr4_sys_waitsys_args *uap, registe
          SCARG(uap, grp), id,
  SCARG(uap, info), SCARG(uap, options)));
 
- error = do_sys_wait(l, &id, &status, options, &ru,
-    &was_zombie);
+ error = do_sys_wait(&id, &status, options, &ru);
 
  retval[0] = id;
  if (error != 0)
diff --git a/sys/compat/svr4_32/svr4_32_misc.c b/sys/compat/svr4_32/svr4_32_misc.c
index ab2a001..666534d 100644
--- a/sys/compat/svr4_32/svr4_32_misc.c
+++ b/sys/compat/svr4_32/svr4_32_misc.c
@@ -1041,8 +1041,7 @@ svr4_32_sys_waitsys(struct lwp *l, const struct svr4_32_sys_waitsys_args *uap, r
  if (SCARG(uap, options) & (SVR4_WSTOPPED|SVR4_WCONTINUED))
  options |= WUNTRACED;
 
- error = do_sys_wait(l, &id, &status, options, &ru,
-    &was_zombie);
+ error = do_sys_wait(&id, &status, options, &ru);
 
  retval[0] = id;
  if (error != 0)

--
  Time is an illusion; lunchtime, doubly so.     |/\/\|           Rafal Boni
                   -- Ford Prefect               |\/\/|      rafal@...

Re: Build failures in compat/svr4 module due to do_sys_wait (+ fix?)

by Rafal Boni :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Thu, Nov 05, 2009 at 10:38:00AM -0500, Rafal Boni wrote:
> The current kernel fails to build when build the SVR4 compat module (if
> it's enabled in the config file; I suspect the module build fails the
> same way):
[...]
> The following looks like it might fix that, though I haven't yet verified:

The patch I sent earlier wasn't sufficient to fix it, but in the meantime
I've checked in a complete fix, so just CVS update if you fall into this.

--rafal

--
  Time is an illusion; lunchtime, doubly so.     |/\/\|           Rafal Boni
                   -- Ford Prefect               |\/\/|      rafal@...

Re: Build failures in compat/svr4 module due to do_sys_wait (+ fix?)

by Mindaugas Rasiukevicius :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Rafal Boni <rafal@...> wrote:
> On Thu, Nov 05, 2009 at 10:38:00AM -0500, Rafal Boni wrote:
> > The current kernel fails to build when build the SVR4 compat module (if
> > it's enabled in the config file; I suspect the module build fails the
> > same way):
> [...]
> > The following looks like it might fix that, though I haven't yet verified:
>
> The patch I sent earlier wasn't sufficient to fix it, but in the meantime
> I've checked in a complete fix, so just CVS update if you fall into this.

Thanks for fixing it, I had no possibility to do it earlier.

Sorry for the breakage.

--
Mindaugas