Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/freebsd Revert previous (1.5) and return to the o...



details:   https://anonhg.NetBSD.org/src/rev/266fd709e035
branches:  trunk
changeset: 998072:266fd709e035
user:      kre <kre%NetBSD.org@localhost>
date:      Sat Apr 06 17:42:28 2019 +0000

description:
Revert previous (1.5) and return to the one before that (1.4), and
just allow things to be broken if this is used on a system where
register_t is int (32 bits) and long is 64 bits.    Badly broken...

diffstat:

 sys/compat/freebsd/freebsd_syscall.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r d3bc77a10900 -r 266fd709e035 sys/compat/freebsd/freebsd_syscall.c
--- a/sys/compat/freebsd/freebsd_syscall.c      Sat Apr 06 17:27:58 2019 +0000
+++ b/sys/compat/freebsd/freebsd_syscall.c      Sat Apr 06 17:42:28 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $  */
+/*     $NetBSD: freebsd_syscall.c,v 1.6 2019/04/06 17:42:28 kre Exp $  */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.6 2019/04/06 17:42:28 kre Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@
                /*
                 * Code is first argument, followed by actual args.
                 */
-               error = ufetch_int((void *)params, &code);
+               error = ufetch_long((void *)params, (u_long *)&code);
                if (error)
                        goto bad;
                params += sizeof(int);
@@ -98,9 +98,9 @@
                 * Like syscall, but code is a quad, so as to maintain
                 * quad alignment for the rest of the arguments.
                 */
-               error = ufetch_int((void *)(params +
+               error = ufetch_long((void *)(params +
                                             _QUAD_LOWWORD * sizeof(int)),
-                                   &code);
+                                   (u_long *)&code);
                if (error)
                        goto bad;
                params += sizeof(quad_t);



Home | Main Index | Thread Index | Old Index