Source-Changes-HG archive

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

[src/trunk]: src/sys/compat/linux Make COMPAT_LINUX compile again on Alpha. ...



details:   https://anonhg.NetBSD.org/src/rev/9c73e887c022
branches:  trunk
changeset: 526877:9c73e887c022
user:      matt <matt%NetBSD.org@localhost>
date:      Mon May 13 05:41:26 2002 +0000

description:
Make COMPAT_LINUX compile again on Alpha.  linux_getdents64 moved but
files.linux_alpha wasn't updated.  common/linux_file64.c contains a lot
of syscalls which aren't on Linux/alpha so #ifdef them for alpha.

diffstat:

 sys/compat/linux/arch/alpha/files.linux_alpha |  9 +++++----
 sys/compat/linux/common/linux_file64.c        |  8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 5ecca641f65f -r 9c73e887c022 sys/compat/linux/arch/alpha/files.linux_alpha
--- a/sys/compat/linux/arch/alpha/files.linux_alpha     Mon May 13 05:37:58 2002 +0000
+++ b/sys/compat/linux/arch/alpha/files.linux_alpha     Mon May 13 05:41:26 2002 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: files.linux_alpha,v 1.5 2002/03/31 22:40:16 christos Exp $
+#      $NetBSD: files.linux_alpha,v 1.6 2002/05/13 05:41:26 matt Exp $
 #
 # Config file description for alpha-dependent Linux compat code.
 
+file   compat/linux/arch/alpha/linux_exec_alpha.c      compat_linux
 file   compat/linux/arch/alpha/linux_machdep.c         compat_linux
+file   compat/linux/arch/alpha/linux_pipe.c            compat_linux
 file   compat/linux/arch/alpha/linux_syscalls.c        compat_linux
 file   compat/linux/arch/alpha/linux_sysent.c          compat_linux
-file   compat/linux/arch/alpha/linux_pipe.c            compat_linux
-file   compat/linux/arch/alpha/linux_exec_alpha.c      compat_linux
+file   compat/linux/common/linux_file64.c              compat_linux
+file   compat/linux/common/linux_olduname.c            compat_linux
 file   compat/linux/common/linux_sigaction.c           compat_linux
-file   compat/linux/common/linux_olduname.c            compat_linux
diff -r 5ecca641f65f -r 9c73e887c022 sys/compat/linux/common/linux_file64.c
--- a/sys/compat/linux/common/linux_file64.c    Mon May 13 05:37:58 2002 +0000
+++ b/sys/compat/linux/common/linux_file64.c    Mon May 13 05:41:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_file64.c,v 1.14 2002/05/13 05:37:58 simonb Exp $ */
+/*     $NetBSD: linux_file64.c,v 1.15 2002/05/13 05:41:27 matt 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.14 2002/05/13 05:37:58 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.15 2002/05/13 05:41:27 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,6 +70,8 @@
 
 #include <compat/linux/linux_syscallargs.h>
 
+#ifndef alpha
+
 static void bsd_to_linux_stat __P((struct stat *, struct linux_stat64 *));
 static int linux_do_stat64 __P((struct proc *, void *, register_t *, int));
 
@@ -337,6 +339,8 @@
 }
 #endif /* !m68k */
 
+#endif /* !alpha */
+
 /*
  * Linux 'readdir' call. This code is mostly taken from the
  * SunOS getdents call (see compat/sunos/sunos_misc.c), though



Home | Main Index | Thread Index | Old Index