Mon Dec 24 20:27:57 2018 UTC ()
pset_create() takes a pointer so it needs special handling.


(mrg)
diff -r1.218 -r1.219 src/sys/compat/netbsd32/netbsd32_netbsd.c

cvs diff -r1.218 -r1.219 src/sys/compat/netbsd32/netbsd32_netbsd.c (expand / switch to unified diff)

--- src/sys/compat/netbsd32/netbsd32_netbsd.c 2018/08/10 21:44:58 1.218
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c 2018/12/24 20:27:57 1.219
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: netbsd32_netbsd.c,v 1.218 2018/08/10 21:44:58 pgoyette Exp $ */ 1/* $NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998, 2001, 2008 Matthew R. Green 4 * Copyright (c) 1998, 2001, 2008 Matthew R. Green
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.218 2018/08/10 21:44:58 pgoyette Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.219 2018/12/24 20:27:57 mrg Exp $");
31 31
32#if defined(_KERNEL_OPT) 32#if defined(_KERNEL_OPT)
33#include "opt_ddb.h" 33#include "opt_ddb.h"
34#include "opt_ntp.h" 34#include "opt_ntp.h"
35#include "opt_ktrace.h" 35#include "opt_ktrace.h"
36#include "opt_compat_netbsd.h" 36#include "opt_compat_netbsd.h"
37#include "opt_compat_43.h" 37#include "opt_compat_43.h"
38#include "opt_sysv.h" 38#include "opt_sysv.h"
39#include "opt_syscall_debug.h" 39#include "opt_syscall_debug.h"
40#endif 40#endif
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
@@ -2786,28 +2786,31 @@ netbsd32_posix_fallocate(struct lwp *l,  @@ -2786,28 +2786,31 @@ netbsd32_posix_fallocate(struct lwp *l,
2786 NETBSD32TO64_UAP(pos); 2786 NETBSD32TO64_UAP(pos);
2787 NETBSD32TO64_UAP(len); 2787 NETBSD32TO64_UAP(len);
2788 2788
2789 return sys_posix_fallocate(l, &ua, retval); 2789 return sys_posix_fallocate(l, &ua, retval);
2790} 2790}
2791 2791
2792int 2792int
2793netbsd32_pset_create(struct lwp *l, 2793netbsd32_pset_create(struct lwp *l,
2794 const struct netbsd32_pset_create_args *uap, register_t *retval) 2794 const struct netbsd32_pset_create_args *uap, register_t *retval)
2795{ 2795{
2796 /* { 2796 /* {
2797 syscallarg(netbsd32_psetidp_t) psid; 2797 syscallarg(netbsd32_psetidp_t) psid;
2798 }; */ 2798 }; */
 2799 struct sys_pset_create_args ua;
2799 2800
2800 return sys_pset_create(l, (const void *)uap, retval); 2801 NETBSD32TOP_UAP(psid, psetid_t);
 2802
 2803 return sys_pset_create(l, &ua, retval);
2801} 2804}
2802 2805
2803int 2806int
2804netbsd32_pset_destroy(struct lwp *l, 2807netbsd32_pset_destroy(struct lwp *l,
2805 const struct netbsd32_pset_destroy_args *uap, register_t *retval) 2808 const struct netbsd32_pset_destroy_args *uap, register_t *retval)
2806{ 2809{
2807 /* { 2810 /* {
2808 syscallarg(psetid_t) psid; 2811 syscallarg(psetid_t) psid;
2809 }; */ 2812 }; */
2810 2813
2811 return sys_pset_destroy(l, (const void *)uap, retval); 2814 return sys_pset_destroy(l, (const void *)uap, retval);
2812} 2815}
2813 2816