[src/pgoyette-compat]: src/sys/compat/common Undo merge of chang...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be3c0e7782a4
branches:  pgoyette-compat
changeset: 318728:be3c0e7782a4
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri May 04 08:13:18 2018 +0000
description:
Undo merge of changes from HEAD.  This will get re-done properly
at the next sync-with-HEAD (which will also pull in other changes
needed).

diffstat:

 sys/compat/common/uipc_syscalls_43.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r fcb2b87a6261 -r be3c0e7782a4 sys/compat/common/uipc_syscalls_43.c
--- a/sys/compat/common/uipc_syscalls_43.c      Fri May 04 02:38:46 2018 +0000
+++ b/sys/compat/common/uipc_syscalls_43.c      Fri May 04 08:13:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $      */
+/*     $NetBSD: uipc_syscalls_43.c,v 1.47.14.4 2018/05/04 08:13:18 pgoyette Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.4 2018/05/04 08:13:18 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -233,7 +233,7 @@
        msg.msg_iov     = omsg.msg_iov;
        msg.msg_flags   = (SCARG(uap, flags) & MSG_USERFLAGS) | MSG_IOVUSRSPACE;
 
-       error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, &from,
+       error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, 0, &from,
            omsg.msg_accrights != NULL ? &control : NULL, retval);
        if (error != 0)
                return error;
@@ -380,7 +380,7 @@
                goto bad;
 
        return do_sys_sendmsg(l, SCARG(uap, s), &msg, SCARG(uap, flags),
-           retval);
+           NULL, 0, retval);
 
     bad:
        if (nam != NULL)