Module Name: src
Committed By: martin
Date: Sat May 16 14:15:50 UTC 2015
Modified Files:
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_lwp.c
Log Message:
Pull up the following revisions, requested by matt in ticket #776:
src/sys/compat/netbsd32/netbsd32_lwp.c 1.15-1.18
Fix _lwp_ctl for big endian 64-bit platforms. (Little-endian too but not
as noticable).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.10.1 src/sys/compat/netbsd32/netbsd32_lwp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_lwp.c
diff -u src/sys/compat/netbsd32/netbsd32_lwp.c:1.15 src/sys/compat/netbsd32/netbsd32_lwp.c:1.15.10.1
--- src/sys/compat/netbsd32/netbsd32_lwp.c:1.15 Fri Mar 29 01:04:30 2013
+++ src/sys/compat/netbsd32/netbsd32_lwp.c Sat May 16 14:15:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_lwp.c,v 1.15 2013/03/29 01:04:30 christos Exp $ */
+/* $NetBSD: netbsd32_lwp.c,v 1.15.10.1 2015/05/16 14:15:50 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_lwp.c,v 1.15 2013/03/29 01:04:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_lwp.c,v 1.15.10.1 2015/05/16 14:15:50 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -280,9 +280,16 @@ netbsd32__lwp_ctl(struct lwp *l, const s
syscallarg(int) features;
syscallarg(netbsd32_pointer_t) address;
} */
- struct sys__lwp_ctl_args ua;
-
- NETBSD32TO64_UAP(features);
- NETBSD32TOP_UAP(address, struct lwpctl *);
- return sys__lwp_ctl(l, &ua, retval);
+ netbsd32_pointer_t vaddr32;
+ int error, features;
+ vaddr_t vaddr;
+
+ features = SCARG(uap, features);
+ features &= ~(LWPCTL_FEATURE_CURCPU | LWPCTL_FEATURE_PCTR);
+ if (features != 0)
+ return ENODEV;
+ if ((error = lwp_ctl_alloc(&vaddr)) != 0)
+ return error;
+ NETBSD32PTR32(vaddr32, (void *)vaddr);
+ return copyout(&vaddr32, SCARG_P32(uap, address), sizeof(vaddr32));
}
