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

[Rafal Boni <rafal%pobox.com@localhost>]

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%pobox.com@localhost