[src/netbsd-1-6]: src/sys/compat/linux Pullup patch (requested by skrll in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/44da848df77e
branches:  netbsd-1-6
changeset: 531383:44da848df77e
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jun 14 02:36:03 2004 +0000

description:
Pullup patch (requested by skrll in ticket #1708)

Bring netbsd-1-6 inline with -current sources after the mistakes in ticket #1686

diffstat:

 sys/compat/linux/arch/arm/syscalls.master     |  4 ++--
 sys/compat/linux/arch/i386/syscalls.master    |  4 ++--
 sys/compat/linux/arch/mips/syscalls.master    |  4 ++--
 sys/compat/linux/arch/powerpc/syscalls.master |  4 ++--
 sys/compat/linux/common/linux_file64.c        |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 9047e2f2fbd4 -r 44da848df77e sys/compat/linux/arch/arm/syscalls.master
--- a/sys/compat/linux/arch/arm/syscalls.master Mon Jun 07 09:00:14 2004 +0000
+++ b/sys/compat/linux/arch/arm/syscalls.master Mon Jun 14 02:36:03 2004 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.11.4.3 2004/05/11 14:30:57 tron Exp $
+       $NetBSD: syscalls.master,v 1.11.4.4 2004/06/14 02:36:03 jmc Exp $
 
 ; Derived from sys/compat/linux/arch/*/syscalls.master
 ; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -331,7 +331,7 @@
                            linux_off_t offset); }
 193    STD             { int linux_sys_truncate64(const char *path, \
                                off_t length); }
-194    STD             { int linux_sys_ftruncate64(int fd, \
+194    STD             { int linux_sys_ftruncate64(unsigned int fd, \
                                off_t length); }
 195    STD             { int linux_sys_stat64(const char *path, \
                                struct linux_stat64 *sp); }
diff -r 9047e2f2fbd4 -r 44da848df77e sys/compat/linux/arch/i386/syscalls.master
--- a/sys/compat/linux/arch/i386/syscalls.master        Mon Jun 07 09:00:14 2004 +0000
+++ b/sys/compat/linux/arch/i386/syscalls.master        Mon Jun 14 02:36:03 2004 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.63.4.2 2004/05/11 14:30:38 tron Exp $
+       $NetBSD: syscalls.master,v 1.63.4.3 2004/06/14 02:36:56 jmc Exp $
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -329,7 +329,7 @@
                            linux_off_t offset); }
 193    STD             { int linux_sys_truncate64(const char *path, \
                            off_t length); }
-194    STD             { int linux_sys_ftruncate64(int fd, \
+194    STD             { int linux_sys_ftruncate64(unsigned int fd, \
                            off_t length); }
 195    STD             { int linux_sys_stat64(const char *path, \
                            struct linux_stat64 *sp); }
diff -r 9047e2f2fbd4 -r 44da848df77e sys/compat/linux/arch/mips/syscalls.master
--- a/sys/compat/linux/arch/mips/syscalls.master        Mon Jun 07 09:00:14 2004 +0000
+++ b/sys/compat/linux/arch/mips/syscalls.master        Mon Jun 14 02:36:03 2004 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.9.4.2 2004/05/11 14:30:44 tron Exp $  
+       $NetBSD: syscalls.master,v 1.9.4.3 2004/06/14 02:36:06 jmc Exp $  
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -370,7 +370,7 @@
                            linux_off_t offset); }
 211    STD             { int linux_sys_truncate64(const char *path, \
                            off_t length); }
-212    STD             { int linux_sys_ftruncate64(int fd, \
+212    STD             { int linux_sys_ftruncate64(unsigned int fd, \
                            off_t length); }
 213    STD             { int linux_sys_stat64(const char *path, \
                            struct linux_stat64 *sp); }
diff -r 9047e2f2fbd4 -r 44da848df77e sys/compat/linux/arch/powerpc/syscalls.master
--- a/sys/compat/linux/arch/powerpc/syscalls.master     Mon Jun 07 09:00:14 2004 +0000
+++ b/sys/compat/linux/arch/powerpc/syscalls.master     Mon Jun 14 02:36:03 2004 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.13.2.2 2004/05/11 14:30:27 tron Exp $  
+       $NetBSD: syscalls.master,v 1.13.2.3 2004/06/14 02:36:59 jmc Exp $  
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -357,7 +357,7 @@
                            linux_off_t offset); }
 193    STD             { int linux_sys_truncate64(const char *path, \
                            off_t length); }
-194    STD             { int linux_sys_ftruncate64(int fd, \
+194    STD             { int linux_sys_ftruncate64(unsigned int fd, \
                            off_t length); }
 195    STD             { int linux_sys_stat64(const char *path, \
                            struct linux_stat64 *sp); }
diff -r 9047e2f2fbd4 -r 44da848df77e sys/compat/linux/common/linux_file64.c
--- a/sys/compat/linux/common/linux_file64.c    Mon Jun 07 09:00:14 2004 +0000
+++ b/sys/compat/linux/common/linux_file64.c    Mon Jun 14 02:36:03 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_file64.c,v 1.18.2.1 2004/05/11 14:30:50 tron Exp $       */
+/*     $NetBSD: linux_file64.c,v 1.18.2.2 2004/06/14 02:36:09 jmc Exp $        */
 
 /*-
  * Copyright (c) 1995, 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.18.2.1 2004/05/11 14:30:50 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.18.2.2 2004/06/14 02:36:09 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -246,7 +246,7 @@
 {
  
        struct linux_sys_ftruncate64_args /* {
-               syscallarg(int) fd;
+               syscallarg(unsigned int) fd;
                syscallarg(off_t) length;
        } */ *uap = v;
        struct sys_ftruncate_args ta;