Attempt to fix the mess.

This commit is contained in:
christos 1998-10-03 20:17:36 +00:00
parent 78f9c9bd25
commit 908291d2fe
72 changed files with 572 additions and 414 deletions

@ -1,6 +1,6 @@
# $NetBSD: Makefile.inc,v 1.1 1998/09/30 21:38:46 erh Exp $
# $NetBSD: Makefile.inc,v 1.2 1998/10/03 20:17:36 christos Exp $
DEP= syscalls.conf syscalls.master ../../../kern/makesyscalls.sh
DEP= syscalls.conf syscalls.master ../../../../kern/makesyscalls.sh
OBJS= linux_sysent.c linux_syscalls.c linux_syscall.h linux_syscallargs.h
${OBJS}: ${DEP}
@ -8,6 +8,6 @@ ${OBJS}: ${DEP}
-mv -f linux_syscalls.c linux_syscalls.c.bak
-mv -f linux_syscall.h linux_syscall.h.bak
-mv -f linux_syscallargs.h linux_syscallargs.h.bak
sh ../../../kern/makesyscalls.sh syscalls.conf syscalls.master
sh ../../../../kern/makesyscalls.sh syscalls.conf syscalls.master
all: ${OBJS}

@ -1,13 +0,0 @@
# $NetBSD: Makefile.sc,v 1.1 1998/09/30 21:38:46 erh Exp $
DEP= syscalls.conf syscalls.master ../../../kern/makesyscalls.sh
OBJS= linux_sysent.c linux_syscalls.c linux_syscall.h linux_syscallargs.h
${OBJS}: ${DEP}
-mv -f linux_sysent.c linux_sysent.c.bak
-mv -f linux_syscalls.c linux_syscalls.c.bak
-mv -f linux_syscall.h linux_syscall.h.bak
-mv -f linux_syscallargs.h linux_syscallargs.h.bak
sh ../../../kern/makesyscalls.sh syscalls.conf syscalls.master
all: ${OBJS}

@ -1,12 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 18:01:53 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:37 christos Exp $
KDIR= /sys/compat/linux/alpha
INCSDIR= /usr/include/compat/linux/alpha
INCS= linux_errno.h linux_exec.h linux_fcntl.h linux_machdep.h linux_mmap.h \
linux_siginfo.h linux_signal.h linux_socket.h linux_syscall.h \
linux_syscallargs.h linux_types.h
.include <../Makefile.sc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.1 1998/10/01 00:34:22 erh Exp $ */
/* $NetBSD: linux_machdep.c,v 1.2 1998/10/03 20:17:37 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -72,15 +72,17 @@
#include <uvm/uvm_extern.h>
#endif
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_exec.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_exec.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <machine/cpu.h>
#include <machine/psl.h>
#include <machine/reg.h>

@ -1,4 +1,4 @@
/* $NetBSD: linux_pipe.c,v 1.1 1998/10/01 00:32:27 erh Exp $ */
/* $NetBSD: linux_pipe.c,v 1.2 1998/10/03 20:17:37 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -49,9 +49,10 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
/*

@ -1,4 +1,4 @@
/* $NetBSD: linux_sigarray.c,v 1.1 1998/10/01 00:32:27 erh Exp $ */
/* $NetBSD: linux_sigarray.c,v 1.2 1998/10/03 20:17:37 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#include <sys/kernel.h>
#include <sys/signal.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_signal.h>
int linux_to_native_sig[LINUX_NSIG] = {
0,

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscall.h,v 1.1 1998/09/30 21:34:32 erh Exp $ */
/* $NetBSD: linux_syscall.h,v 1.2 1998/10/03 20:17:37 christos Exp $ */
/*
* System call numbers.

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscallargs.h,v 1.1 1998/09/30 21:34:33 erh Exp $ */
/* $NetBSD: linux_syscallargs.h,v 1.2 1998/10/03 20:17:37 christos Exp $ */
/*
* System call argument lists.

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscalls.c,v 1.1 1998/09/30 21:34:33 erh Exp $ */
/* $NetBSD: linux_syscalls.c,v 1.2 1998/10/03 20:17:38 christos Exp $ */
/*
* System call names.
@ -13,14 +13,14 @@
#include <sys/signal.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/alpha/linux_syscallargs.h>
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_msg.h>
#include <compat/linux/linux_sem.h>
#include <compat/linux/linux_shm.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_ipc.h>
#include <compat/linux/common/linux_msg.h>
#include <compat/linux/common/linux_sem.h>
#include <compat/linux/common/linux_shm.h>
#include <compat/linux/linux_syscallargs.h>
#endif /* _KERNEL && ! _LKM */
char *linux_syscallnames[] = {

@ -1,4 +1,4 @@
/* $NetBSD: linux_sysent.c,v 1.1 1998/09/30 21:34:34 erh Exp $ */
/* $NetBSD: linux_sysent.c,v 1.2 1998/10/03 20:17:38 christos Exp $ */
/*
* System call switch table.
@ -12,14 +12,14 @@
#include <sys/signal.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/alpha/linux_syscallargs.h>
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_msg.h>
#include <compat/linux/linux_sem.h>
#include <compat/linux/linux_shm.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_ipc.h>
#include <compat/linux/common/linux_msg.h>
#include <compat/linux/common/linux_sem.h>
#include <compat/linux/common/linux_shm.h>
#include <compat/linux/linux_syscallargs.h>
#define s(type) sizeof(type)

@ -1,4 +1,4 @@
$NetBSD: syscalls.master,v 1.1 1998/09/30 18:01:54 erh Exp $
$NetBSD: syscalls.master,v 1.2 1998/10/03 20:17:38 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@ -58,17 +58,17 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/alpha/linux_syscallargs.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_ipc.h>
#include <compat/linux/common/linux_msg.h>
#include <compat/linux/common/linux_sem.h>
#include <compat/linux/common/linux_shm.h>
;#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_msg.h>
#include <compat/linux/linux_sem.h>
#include <compat/linux/linux_shm.h>
#include <compat/linux/linux_syscallargs.h>
;#include <compat/linux/linux_machdep.h>
0 NOARGS { int sys_nosys(void); } syscall
1 NOARGS { int sys_exit(int rval); }

@ -1,11 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/10/01 00:28:33 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:38 christos Exp $
KDIR= /sys/compat/linux/i386
INCSDIR= /usr/include/compat/linux/i386
INCS= linux_errno.h linux_exec.h linux_fcntl.h linux_machdep.h linux_mmap.h \
linux_signal.h linux_socket.h linux_syscall.h linux_syscallargs.h \
linux_types.h
.include <../Makefile.sc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,23 +1,21 @@
# $NetBSD: files.linux_i386,v 1.1 1998/10/01 00:29:11 erh Exp $
# $NetBSD: files.linux_i386,v 1.2 1998/10/03 20:17:38 christos Exp $
#
# Config file description for i386-dependent Linux compat code.
file compat/linux/i386/linux_machdep.c compat_linux
file compat/linux/i386/linux_syscalls.c compat_linux
file compat/linux/i386/linux_sysent.c compat_linux
file compat/linux/i386/linux_sigarray.c compat_linux
file compat/linux/arch/i386/linux_machdep.c compat_linux
file compat/linux/arch/i386/linux_syscalls.c compat_linux
file compat/linux/arch/i386/linux_sysent.c compat_linux
file compat/linux/arch/i386/linux_sigarray.c compat_linux
file compat/linux/multiarch/linux_pipe.c compat_linux
file compat/linux/multiarch/linux_ipccall.c compat_linux
file compat/linux/multiarch/linux_misc_notalpha.c compat_linux
file compat/linux/multiarch/linux_sig_notalpha.c compat_linux
file compat/linux/multiarch/linux_sigaction.c compat_linux
file compat/linux/multiarch/linux_socketcall.c compat_linux
file compat/linux/multiarch/linux_llseek.c compat_linux
file compat/linux/multiarch/linux_break.c compat_linux
file compat/linux/multiarch/linux_oldmmap.c compat_linux
file compat/linux/multiarch/linux_oldselect.c compat_linux
file compat/linux/multiarch/linux_olduname.c compat_linux
file compat/linux/multiarch/linux_oldolduname.c compat_linux
file compat/linux/common/linux_pipe.c compat_linux
file compat/linux/common/linux_ipccall.c compat_linux
file compat/linux/common/linux_misc_notalpha.c compat_linux
file compat/linux/common/linux_sig_notalpha.c compat_linux
file compat/linux/common/linux_sigaction.c compat_linux
file compat/linux/common/linux_socketcall.c compat_linux
file compat/linux/common/linux_llseek.c compat_linux
file compat/linux/common/linux_break.c compat_linux
file compat/linux/common/linux_oldmmap.c compat_linux
file compat/linux/common/linux_oldselect.c compat_linux
file compat/linux/common/linux_olduname.c compat_linux
file compat/linux/common/linux_oldolduname.c compat_linux

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.43 1998/10/01 02:17:31 erh Exp $ */
/* $NetBSD: linux_machdep.c,v 1.44 1998/10/03 20:17:38 christos Exp $ */
/*
* Copyright (c) 1995 Frank van der Linden
@ -57,13 +57,14 @@
#include <sys/filedesc.h>
#include <sys/exec_elf.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_exec.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_exec.h>
#include <compat/linux/linux_machdep.h>
#include <machine/cpu.h>
#include <machine/cpufunc.h>

@ -1,4 +1,4 @@
/* $NetBSD: linux_sigarray.c,v 1.14 1998/10/01 02:27:33 erh Exp $ */
/* $NetBSD: linux_sigarray.c,v 1.15 1998/10/03 20:17:38 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
#include <sys/kernel.h>
#include <sys/signal.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_signal.h>
int linux_to_native_sig[LINUX_NSIG] = {
0,

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscall.h,v 1.1 1998/10/01 02:05:32 erh Exp $ */
/* $NetBSD: linux_syscall.h,v 1.2 1998/10/03 20:17:38 christos Exp $ */
/*
* System call numbers.

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscallargs.h,v 1.1 1998/10/01 02:05:33 erh Exp $ */
/* $NetBSD: linux_syscallargs.h,v 1.2 1998/10/03 20:17:38 christos Exp $ */
/*
* System call argument lists.

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscalls.c,v 1.1 1998/10/01 02:05:33 erh Exp $ */
/* $NetBSD: linux_syscalls.c,v 1.2 1998/10/03 20:17:39 christos Exp $ */
/*
* System call names.
@ -13,11 +13,11 @@
#include <sys/signal.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/i386/linux_syscallargs.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#endif /* _KERNEL && ! _LKM */
char *linux_syscallnames[] = {

@ -1,4 +1,4 @@
/* $NetBSD: linux_sysent.c,v 1.1 1998/10/01 02:05:33 erh Exp $ */
/* $NetBSD: linux_sysent.c,v 1.2 1998/10/03 20:17:39 christos Exp $ */
/*
* System call switch table.
@ -12,11 +12,11 @@
#include <sys/signal.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/i386/linux_syscallargs.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#define s(type) sizeof(type)

@ -1,4 +1,4 @@
$NetBSD: syscalls.master,v 1.26 1998/10/01 02:03:17 erh Exp $
$NetBSD: syscalls.master,v 1.27 1998/10/03 20:17:39 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@ -39,12 +39,13 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/i386/linux_syscallargs.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_machdep.h>
0 NOARGS { int sys_nosys(void); } syscall
1 NOARGS { int sys_exit(int rval); }

@ -1,3 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 21:55:58 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:39 christos Exp $
.include <../Makefile.inc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,3 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 21:55:58 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:39 christos Exp $
.include <../Makefile.inc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,3 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 21:55:59 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:39 christos Exp $
.include <../Makefile.inc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,3 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 21:55:59 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:39 christos Exp $
.include <../Makefile.inc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,3 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/09/30 21:56:00 erh Exp $
# $NetBSD: Makefile,v 1.2 1998/10/03 20:17:39 christos Exp $
.include <../Makefile.inc>
.include <../../Makefile.inc>
.include <bsd.kinc.mk>

@ -1,4 +1,4 @@
/* $NetBSD: linux_break.c,v 1.47 1998/10/01 04:05:55 erh Exp $ */
/* $NetBSD: linux_break.c,v 1.48 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -73,8 +73,8 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>

@ -1,4 +1,4 @@
/* $NetBSD: linux_cdrom.c,v 1.2 1998/10/01 02:30:37 erh Exp $ */
/* $NetBSD: linux_cdrom.c,v 1.3 1998/10/03 20:17:40 christos Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -44,12 +44,13 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_cdrom.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_cdrom.h>
#if 0
#define DPRINTF(x) printf x

@ -1,9 +1,12 @@
/* $NetBSD: linux_cdrom.h,v 1.2 1998/10/01 02:30:37 erh Exp $ */
/* $NetBSD: linux_cdrom.h,v 1.3 1998/10/03 20:17:40 christos Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Eric Haszlakiewicz.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@ -14,8 +17,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
@ -33,8 +36,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_CDROM_H
#define _COMMON_LINUX_CDROM_H
#ifndef _LINUX_CDROM_H
#define _LINUX_CDROM_H
#define LINUX_CDROMPAUSE 0x5301
#define LINUX_CDROMRESUME 0x5302
@ -116,4 +119,4 @@ struct linux_cdrom_volctrl {
u_char channel3;
};
#endif /* !_COMMON_LINUX_CDROM_H */
#endif /* !_LINUX_CDROM_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_dirent.h,v 1.4 1998/10/01 03:37:51 erh Exp $ */
/* $NetBSD: linux_dirent.h,v 1.5 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_DIRENT_H
#define _COMMON_LINUX_DIRENT_H
#ifndef _LINUX_DIRENT_H
#define _LINUX_DIRENT_H
#define LINUX_MAXNAMLEN 255
@ -82,4 +82,4 @@ struct linux_dirent {
#define LINUX_NAMEOFF(dp) ((char *)&(dp)->d_name - (char *)dp)
#define LINUX_RECLEN(de,namlen) ALIGN((LINUX_NAMEOFF(de) + (namlen) + 1))
#endif /* !_COMMON_LINUX_DIRENT_H */
#endif /* !_LINUX_DIRENT_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_errno.h,v 1.2 1998/10/01 01:03:37 erh Exp $ */
/* $NetBSD: linux_errno.h,v 1.3 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_ERRNO_H
#define _COMMON_LINUX_ERRNO_H
#ifndef _LINUX_ERRNO_H
#define _LINUX_ERRNO_H
#define LINUX_EPERM 1
#define LINUX_ENOENT 2
@ -106,7 +106,15 @@
#define LINUX_ERANGE 34
#define LINUX_EDEADLK 35
/* Error numbers after here vary wildly */
/* depending on the machine architechture. */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_errno.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_errno.h>
#else
#error Undefined linux_errno.h machine type.
#endif
#endif /* !_COMMON_LINUX_ERRNO_H */
#endif /* !_LINUX_ERRNO_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_error.c,v 1.5 1998/10/01 02:32:24 erh Exp $ */
/* $NetBSD: linux_error.c,v 1.6 1998/10/03 20:17:40 christos Exp $ */
/*
* Copyright (c) 1995 Frank van der Linden
@ -31,7 +31,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <compat/linux/linux_errno.h>
#include <compat/linux/common/linux_errno.h>
/*
* This list is used to translate NetBSD errors to linux errors

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec.c,v 1.31 1998/10/01 03:11:33 erh Exp $ */
/* $NetBSD: linux_exec.c,v 1.32 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -89,15 +89,16 @@
#include <machine/cpu.h>
#include <machine/reg.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_exec.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_exec.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_machdep.h>
const char linux_emul_path[] = "/emul/linux";

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec.h,v 1.9 1998/10/01 02:11:00 erh Exp $ */
/* $NetBSD: linux_exec.h,v 1.10 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,9 +67,17 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef _LINUX_EXEC_H
#define _LINUX_EXEC_H
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_exec.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_exec.h>
#else
#error Undefined linux_exec.h machine type.
#endif
#ifndef _COMMON_LINUX_EXEC_H
#define _COMMON_LINUX_EXEC_H
/* Defines for a.out executables */
#define LINUX_AOUT_HDR_SIZE (sizeof (struct exec))
@ -110,4 +118,4 @@ int linux_elf64_probe __P((struct proc *, struct exec_package *, Elf64_Ehdr *,
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_COMMON_LINUX_EXEC_H */
#endif /* !_LINUX_EXEC_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec_aout.c,v 1.31 1998/10/01 03:11:33 erh Exp $ */
/* $NetBSD: linux_exec_aout.c,v 1.32 1998/10/03 20:17:40 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -86,17 +86,19 @@
#include <vm/vm_param.h>
#include <vm/vm_map.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_exec.h>
#include <machine/cpu.h>
#include <machine/reg.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_exec.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
static void *linux_aout_copyargs __P((struct exec_package *,
struct ps_strings *, void *, void *));

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec_elf32.c,v 1.31 1998/10/01 03:11:33 erh Exp $ */
/* $NetBSD: linux_exec_elf32.c,v 1.32 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -93,15 +93,15 @@
#include <machine/cpu.h>
#include <machine/reg.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_exec.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_exec.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
static int ELFNAME2(linux,signature) __P((struct proc *, struct exec_package *,
Elf_Ehdr *));

@ -1,4 +1,4 @@
/* $NetBSD: linux_fcntl.h,v 1.2 1998/10/01 01:16:42 erh Exp $ */
/* $NetBSD: linux_fcntl.h,v 1.3 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_FCNTL_H
#define _COMMON_LINUX_FCNTL_H
#ifndef _LINUX_FCNTL_H
#define _LINUX_FCNTL_H
/*
* The arguments in the flock structure have a different order from the
@ -89,4 +89,12 @@ struct linux_flock {
linux_pid_t l_pid;
};
#endif /* !_COMMON_LINUX_FCNTL_H */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_fcntl.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_fcntl.h>
#else
#error Undefined linux_fcntl.h machine type.
#endif
#endif /* !_LINUX_FCNTL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_file.c,v 1.23 1998/10/01 03:22:11 erh Exp $ */
/* $NetBSD: linux_file.c,v 1.24 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -89,14 +89,14 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_siginfo.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_fcntl.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_siginfo.h>
#include <compat/linux/common/linux_fcntl.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_machdep.h>
#include <compat/linux/linux_machdep.h>
#include <compat/linux/linux_syscallargs.h>
static int linux_to_bsd_ioflags __P((int));
static int bsd_to_linux_ioflags __P((int));

@ -1,4 +1,4 @@
/* $NetBSD: linux_ioctl.c,v 1.19 1998/10/01 03:24:28 erh Exp $ */
/* $NetBSD: linux_ioctl.c,v 1.20 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -85,10 +85,11 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/ossaudio/ossaudio.h>
#define LINUX_TO_OSS(v) (v) /* do nothing, same ioctl() encoding */

@ -1,4 +1,4 @@
/* $NetBSD: linux_ioctl.h,v 1.8 1998/10/01 01:33:04 erh Exp $ */
/* $NetBSD: linux_ioctl.h,v 1.9 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_IOCTL_H
#define _COMMON_LINUX_IOCTL_H
#ifndef _LINUX_IOCTL_H
#define _LINUX_IOCTL_H
struct linux_sys_ioctl_args;
@ -84,4 +84,12 @@ int linux_ioctl_socket __P((struct proc *, struct linux_sys_ioctl_args *,
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_COMMON_LINUX_IOCTL_H */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_ioctl.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_ioctl.h>
#else
#error Undefined linux_ioctl.h machine type.
#endif
#endif /* !_LINUX_IOCTL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipc.c,v 1.14 1998/10/01 03:27:38 erh Exp $ */
/* $NetBSD: linux_ipc.c,v 1.15 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -78,16 +78,18 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_msg.h>
#include <compat/linux/linux_shm.h>
#include <compat/linux/linux_sem.h>
#include <compat/linux/linux_ipccall.h>
#include <compat/linux/common/linux_ipc.h>
#include <compat/linux/common/linux_msg.h>
#include <compat/linux/common/linux_shm.h>
#include <compat/linux/common/linux_sem.h>
#include <compat/linux/common/linux_ipccall.h>
/*
* Note: Not all linux architechtures have explicit versions

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipc.h,v 1.2 1998/10/01 03:48:32 erh Exp $ */
/* $NetBSD: linux_ipc.h,v 1.3 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_IPC_H
#define _COMMON_LINUX_IPC_H
#ifndef _LINUX_IPC_H
#define _LINUX_IPC_H
#include <sys/ipc.h>
@ -110,4 +110,4 @@ __END_DECLS
#endif /* !_KERNEL */
#endif /* !SYSVSEM, !SYSVSHM, !SYSVMSG */
#endif /* !_COMMON_LINUX_IPC_H */
#endif /* !_LINUX_IPC_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipccall.c,v 1.14 1998/10/01 03:27:38 erh Exp $ */
/* $NetBSD: linux_ipccall.c,v 1.15 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -81,21 +81,23 @@
/* sys_ipc + args prototype */
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
/* general ipc defines */
#include <compat/linux/linux_ipc.h>
#include <compat/linux/common/linux_ipc.h>
/* prototypes for real/normal linux-emul syscalls */
#include <compat/linux/linux_msg.h>
#include <compat/linux/linux_shm.h>
#include <compat/linux/linux_sem.h>
#include <compat/linux/common/linux_msg.h>
#include <compat/linux/common/linux_shm.h>
#include <compat/linux/common/linux_sem.h>
/* prototypes for sys_ipc stuff */
#include <compat/linux/linux_ipccall.h>
#include <compat/linux/common/linux_ipccall.h>
/* Used on: arm, i386, m68k, mips, ppc, sparc, sparc64 */
/* Not used on: alpha */

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipccall.h,v 1.3 1998/10/01 03:29:46 erh Exp $ */
/* $NetBSD: linux_ipccall.h,v 1.4 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,9 +67,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _MULTIARCH_LINUX_IPCCALL_H
#define _MULTIARCH_LINUX_IPCCALL_H
#ifndef _LINUX_IPCCALL_H
#define _LINUX_IPCCALL_H
/*
* All linux architectures except alpha use the sys_ipc
* syscall and need the associated defines.
*/
# if !defined(__alpha__)
/* Used on: arm, i386, m68k, mips, ppc, sparc, sparc64 */
/* Not used on: alpha */
@ -91,29 +96,30 @@
#define LINUX_SYS_shmctl 24
#ifdef SYSVSEM
# ifdef SYSVSEM
inline int linux_semop __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
register_t *));
inline int linux_semget __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
#endif
register_t *));
# endif
#ifdef SYSVMSG
# ifdef SYSVMSG
inline int linux_msgsnd __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
register_t *));
inline int linux_msgrcv __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
register_t *));
inline int linux_msgget __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
#endif
register_t *));
# endif
#ifdef SYSVSHM
# ifdef SYSVSHM
inline int linux_shmdt __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
register_t *));
inline int linux_shmget __P((struct proc *, struct linux_sys_ipc_args *,
register_t *));
#endif
register_t *));
# endif
#endif /* !_MULTIARCH_LINUX_IPCCALL_H */
# endif
#endif /* !_LINUX_IPCCALL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_llseek.c,v 1.23 1998/10/01 03:22:11 erh Exp $ */
/* $NetBSD: linux_llseek.c,v 1.24 1998/10/03 20:17:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -76,11 +76,12 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_fcntl.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_fcntl.h>
#include <compat/linux/linux_util.h>
/* Used on: arm, i386, m68k, mips, ppc, sparc */
/* Not used on: alpha, sparc64 */

@ -1,4 +1,4 @@
/* $NetBSD: linux_misc.c,v 1.48 1998/10/01 18:53:37 perry Exp $ */
/* $NetBSD: linux_misc.c,v 1.49 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -124,14 +124,17 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_fcntl.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_dirent.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_misc.h>
#include <compat/linux/common/linux_fcntl.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_dirent.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_misc.h>
/* Local linux_misc.c functions: */
static void bsd_to_linux_statfs __P((struct statfs *, struct linux_statfs *));

@ -1,4 +1,4 @@
/* $NetBSD: linux_misc.h,v 1.1 1998/10/01 03:49:59 erh Exp $ */
/* $NetBSD: linux_misc.h,v 1.2 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -36,8 +36,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_MISC_H
#define _COMMON_LINUX_MISC_H
#ifndef _LINUX_MISC_H
#define _LINUX_MISC_H
#ifdef _KERNEL
__BEGIN_DECLS
@ -47,4 +47,4 @@ int linux_select1 __P((struct proc *, register_t *, int, fd_set *, fd_set *,
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_COMMON_LINUX_MISC_H */
#endif /* !_LINUX_MISC_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_misc_notalpha.c,v 1.47 1998/10/01 04:05:55 erh Exp $ */
/* $NetBSD: linux_misc_notalpha.c,v 1.48 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -85,13 +85,14 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_fcntl.h>
#include <compat/linux/linux_misc.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_fcntl.h>
#include <compat/linux/common/linux_misc.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
/*
* This file contains routines which are used

@ -1,4 +1,4 @@
/* $NetBSD: linux_mmap.h,v 1.2 1998/10/01 00:53:45 erh Exp $ */
/* $NetBSD: linux_mmap.h,v 1.3 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_MMAP_H
#define _COMMON_LINUX_MMAP_H
#ifndef _LINUX_MMAP_H
#define _LINUX_MMAP_H
#define LINUX_PROT_NONE 0x00
#define LINUX_PROT_READ 0x01
@ -78,4 +78,29 @@
#define LINUX_MAP_SHARED 0x0001
#define LINUX_MAP_PRIVATE 0x0002
#endif /* !_COMMON_LINUX_MMAP_H */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_mmap.h>
#include <compat/linux/common/linux_oldmmap.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_mmap.h>
/*
* XXX ERH: All below here are guesses. The header
* XXX ERH: files are correct but the defined(*)
* XXX ERH: probably aren't
*
* XXX ERH: Can probably drop some of these headers: linux
* XXX ERH: is stupid about compat stuff. It doesn't really
* XXX ERH: use all the defines, but I don't want to go looking
* XXX ERH: through all the kernel sources right now.
*/
#elif defined(__mips__)
#include <compat/linux/arch/mips/linux_mmap.h>
#elif defined(__powerpc__)
#include <compat/linux/arch/powerpc/linux_mmap.h>
#elif defined(sparc)
#include <compat/linux/arch/sparc/linux_mmap.h>
#else
#error Undefined linux_mmap.h machine type.
#endif
#endif /* !_LINUX_MMAP_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_msg.h,v 1.3 1998/10/01 03:48:32 erh Exp $ */
/* $NetBSD: linux_msg.h,v 1.4 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_MSG_H
#define _COMMON_LINUX_MSG_H
#ifndef _LINUX_MSG_H
#define _LINUX_MSG_H
#include <sys/msg.h>
@ -148,4 +148,4 @@ __END_DECLS
#endif /* !_KERNEL */
#endif /* !SYSVMSG */
#endif /* !_COMMON_LINUX_MSG_H */
#endif /* !_LINUX_MSG_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_oldmmap.c,v 1.47 1998/10/01 04:05:55 erh Exp $ */
/* $NetBSD: linux_oldmmap.c,v 1.48 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,9 +77,10 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
/* Used on: arm, i386, m68k */

@ -1,4 +1,4 @@
/* $NetBSD: linux_oldolduname.c,v 1.48 1998/10/01 18:58:28 perry Exp $ */
/* $NetBSD: linux_oldolduname.c,v 1.49 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,9 +77,11 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_oldolduname.h>
#include <compat/linux/linux_syscallargs.h>
/* Used on: arm, i386, mips, ppc */

@ -1,4 +1,4 @@
/* $NetBSD: linux_oldselect.c,v 1.47 1998/10/01 04:05:55 erh Exp $ */
/* $NetBSD: linux_oldselect.c,v 1.48 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,10 +77,12 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_misc.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_misc.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_oldselect.h>
#include <compat/linux/linux_syscallargs.h>
/* Used on: arm, i386, m68k */

@ -1,4 +1,4 @@
/* $NetBSD: linux_olduname.c,v 1.48 1998/10/01 18:57:05 perry Exp $ */
/* $NetBSD: linux_olduname.c,v 1.49 1998/10/03 20:17:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -79,9 +79,10 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
/* Used on: (alpha), arm, i386, mips, ppc */

@ -1,4 +1,4 @@
/* $NetBSD: linux_pipe.c,v 1.47 1998/10/01 04:05:56 erh Exp $ */
/* $NetBSD: linux_pipe.c,v 1.48 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -80,9 +80,10 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_mmap.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/linux_syscallargs.h>
/* Used on: arm, i386, m68k, ppc */

@ -1,4 +1,4 @@
/* $NetBSD: linux_sem.h,v 1.2 1998/10/01 03:48:32 erh Exp $ */
/* $NetBSD: linux_sem.h,v 1.3 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_SEM_H
#define _COMMON_LINUX_SEM_H
#ifndef _LINUX_SEM_H
#define _LINUX_SEM_H
#include <sys/sem.h>
@ -121,11 +121,11 @@ struct linux_sys_semctl_args {
__BEGIN_DECLS
int linux_sys_semctl __P((struct proc *, void *, register_t *));
void bsd_to_linux_semid_ds __P((struct semid_ds *,
struct linux_semid_ds *));
struct linux_semid_ds *));
void linux_to_bsd_semid_ds __P((struct linux_semid_ds *,
struct semid_ds *));
struct semid_ds *));
__END_DECLS
#endif /* !_KERNEL */
#endif /* !SYSVSEM */
#endif /* !_COMMON_LINUX_SEM_H */
#endif /* !_LINUX_SEM_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_shm.h,v 1.2 1998/10/01 03:48:32 erh Exp $ */
/* $NetBSD: linux_shm.h,v 1.3 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_SHM_H
#define _COMMON_LINUX_SHM_H
#ifndef _LINUX_SHM_H
#define _LINUX_SHM_H
#include <sys/shm.h>
@ -119,11 +119,11 @@ __BEGIN_DECLS
int linux_sys_shmat __P((struct proc *, void *, register_t *));
int linux_sys_shmctl __P((struct proc *, void *, register_t *));
void linux_to_bsd_shmid_ds __P((struct linux_shmid_ds *,
struct shmid_ds *));
struct shmid_ds *));
void bsd_to_linux_shmid_ds __P((struct shmid_ds *,
struct linux_shmid_ds *));
struct linux_shmid_ds *));
__END_DECLS
#endif /* !_KERNEL */
#endif /* !SYSVSHM */
#endif /* !_COMMON_LINUX_SHM_H */
#endif /* !_LINUX_SHM_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_sig_notalpha.c,v 1.14 1998/10/01 02:27:34 erh Exp $ */
/* $NetBSD: linux_sig_notalpha.c,v 1.15 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -80,10 +80,11 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
/* Used on: arm, i386, m68k, mips, sparc, sparc64 */
/* Not used on: alpha */

@ -1,4 +1,4 @@
/* $NetBSD: linux_sigaction.c,v 1.14 1998/10/01 02:27:34 erh Exp $ */
/* $NetBSD: linux_sigaction.c,v 1.15 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -80,10 +80,11 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
/* Used on: arm, i386, m68k, mips, ppc */
/* Not used on: alpha, sparc, sparc64 */

@ -1,4 +1,4 @@
/* $NetBSD: linux_signal.c,v 1.14 1998/10/01 02:27:33 erh Exp $ */
/* $NetBSD: linux_signal.c,v 1.15 1998/10/03 20:17:43 christos Exp $ */
/*
* Copyright (c) 1998 Eric Haszlakiewicz
@ -63,10 +63,11 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
/* Locally used defines (in bsd<->linux conversion functions): */
/* XXX XAX rename to linux_old. Add stuff for new type linux_sigset_t

@ -1,7 +1,42 @@
/* $NetBSD: linux_signal.h,v 1.6 1998/10/01 00:57:30 erh Exp $ */
/* $NetBSD: linux_signal.h,v 1.7 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Eric Haszlakiewicz.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Copyright (c) 1998 Eric Haszlakiewicz
* Copyright (c) 1995 Frank van der Linden
* All rights reserved.
*
@ -32,10 +67,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* Note: Machine dependant portions of this file exist. */
#ifndef _LINUX_SIGNAL_H
#define _LINUX_SIGNAL_H
#ifndef _COMMON_LINUX_SIGNAL_H
#define _COMMON_LINUX_SIGNAL_H
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_signal.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_signal.h>
#else
#error Undefined linux_signal.h machine type.
#endif
#ifdef _KERNEL
extern int native_to_linux_sig[];
@ -51,21 +92,21 @@ void native_to_linux_sigset __P((const sigset_t *, linux_sigset_t *));
#endif
#define linux_to_native_sigset(x,y) \
linux_old_to_native_sigset((linux_old_sigset_t *)x, y)
linux_old_to_native_sigset((linux_old_sigset_t *)x, y)
#define native_to_linux_sigset(x,y) \
native_to_linux_old_sigset(x, (linux_old_sigset_t *)y)
native_to_linux_old_sigset(x, (linux_old_sigset_t *)y)
void linux_old_to_native_sigaction __P((struct linux_old_sigaction *, \
struct sigaction *));
void native_to_linux_old_sigaction __P((struct sigaction *, \
struct linux_old_sigaction *));
void linux_old_to_native_sigaction __P((struct linux_old_sigaction *,
struct sigaction *));
void native_to_linux_old_sigaction __P((struct sigaction *,
struct linux_old_sigaction *));
void linux_to_native_sigaction __P((struct linux_sigaction *, \
struct sigaction *));
void linux_to_native_sigaction __P((struct linux_sigaction *,
struct sigaction *));
void native_to_linux_sigaction __P((struct sigaction *, \
struct linux_sigaction *));
struct linux_sigaction *));
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_COMMON_LINUX_SIGNAL_H */
#endif /* !_LINUX_SIGNAL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_socket.c,v 1.16 1998/10/01 03:33:18 erh Exp $ */
/* $NetBSD: linux_socket.c,v 1.17 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -94,14 +94,15 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_socket.h>
#include <compat/linux/common/linux_socketcall.h>
#include <compat/linux/common/linux_sockio.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_socket.h>
#include <compat/linux/linux_socketcall.h>
#include <compat/linux/linux_sockio.h>
/*
* The calls in this file are entered either via the linux_socketcall()

@ -1,4 +1,4 @@
/* $NetBSD: linux_socket.h,v 1.4 1998/10/01 01:19:07 erh Exp $ */
/* $NetBSD: linux_socket.h,v 1.5 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,10 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* Note: Machine dependant portions of this file exist. */
#ifndef _COMMON_LINUX_SOCKET_H
#define _COMMON_LINUX_SOCKET_H
#ifndef _LINUX_SOCKET_H
#define _LINUX_SOCKET_H
/*
* Various Linux socket defines. Everything that is not re-defined here
@ -156,4 +154,12 @@
#define LINUX_TCP_NODELAY 1
#define LINUX_TCP_MAXSEG 2
#endif /* !_COMMON_LINUX_SOCKET_H */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_socket.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_socket.h>
#else
#error Undefined linux_socket.h machine type.
#endif
#endif /* !_LINUX_SOCKET_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_socketcall.c,v 1.16 1998/10/01 03:33:18 erh Exp $ */
/* $NetBSD: linux_socketcall.c,v 1.17 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -89,14 +89,15 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_socket.h>
#include <compat/linux/common/linux_socketcall.h>
#include <compat/linux/common/linux_sockio.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_socket.h>
#include <compat/linux/linux_socketcall.h>
#include <compat/linux/linux_sockio.h>
/* Used on: arm, i386, m68k, mips, ppc, sparc, sparc64 */
/* Not used on: alpha */

@ -1,4 +1,4 @@
/* $NetBSD: linux_socketcall.h,v 1.2 1998/10/01 03:34:50 erh Exp $ */
/* $NetBSD: linux_socketcall.h,v 1.3 1998/10/03 20:17:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,9 +67,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _MULTIARCH_LINUX_SOCKETCALL_H
#define _MULTIARCH_LINUX_SOCKETCALL_H
#ifndef _LINUX_SOCKETCALL_H
#define _LINUX_SOCKETCALL_H
/* Alpha does not use the socketcall multiplexer */
#if !defined(__alpha__)
/* Used on: arm, i386, m68k, mips, ppc, sparc, sparc64 */
/* Not used on: alpha */
@ -225,7 +227,7 @@ struct linux_sys_recvmsg_args {
syscallarg(u_int) flags;
};
#ifdef _KERNEL
# ifdef _KERNEL
__BEGIN_DECLS
int linux_sys_socket __P((struct proc *, void *, register_t *));
int linux_sys_socketpair __P((struct proc *, void *, register_t *));
@ -234,6 +236,8 @@ int linux_sys_recvfrom __P((struct proc *, void *, register_t *));
int linux_sys_setsockopt __P((struct proc *, void *, register_t *));
int linux_sys_getsockopt __P((struct proc *, void *, register_t *));
__END_DECLS
#endif /* !_KERNEL */
# endif /* !_KERNEL */
#endif /* !_MULTIARCH_LINUX_SOCKETCALL_H */
# endif
#endif /* !_LINUX_SOCKETCALL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_sockio.h,v 1.6 1998/10/01 03:53:01 erh Exp $ */
/* $NetBSD: linux_sockio.h,v 1.7 1998/10/03 20:17:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,8 +67,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_SOCKIO_H
#define _COMMON_LINUX_SOCKIO_H
#ifndef _LINUX_SOCKIO_H
#define _LINUX_SOCKIO_H
#define LINUX_SIOCGIFCONF _LINUX_IO(0x89, 0x12)
#define LINUX_SIOCGIFFLAGS _LINUX_IO(0x89, 0x13)
@ -79,4 +79,4 @@
#define LINUX_SIOCADDMULTI _LINUX_IO(0x89, 0x31)
#define LINUX_SIOCDELMULTI _LINUX_IO(0x89, 0x32)
#endif /* !_COMMON_LINUX_SOCKIO_H */
#endif /* !_LINUX_SOCKIO_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_termios.c,v 1.4 1998/10/01 03:36:27 erh Exp $ */
/* $NetBSD: linux_termios.c,v 1.5 1998/10/03 20:17:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -78,12 +78,13 @@
#include <sys/syscallargs.h>
#include <compat/linux/linux_types.h>
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
#include <compat/linux/common/linux_termios.h>
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_termios.h>
static speed_t linux_speeds[] = {
0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,

@ -1,4 +1,4 @@
/* $NetBSD: linux_termios.h,v 1.3 1998/10/01 01:52:59 erh Exp $ */
/* $NetBSD: linux_termios.h,v 1.4 1998/10/03 20:17:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -36,8 +36,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _COMMON_LINUX_TERMIOS_H
#define _COMMON_LINUX_TERMIOS_H
#ifndef _LINUX_TERMIOS_H
#define _LINUX_TERMIOS_H
struct linux_winsize {
unsigned short ws_row;
@ -109,4 +109,11 @@ struct linux_termios {
#define LINUX_N_X25 6
#define LINUX_N_6PACK 7
#endif /* !_COMMON_LINUX_TERMIOS_H */
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_termios.h>
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_termios.h>
#else
#error Undefined linux_termios.h machine type.
#endif
#endif /* !_LINUX_TERMIOS_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_types.h,v 1.6 1998/10/01 01:31:11 erh Exp $ */
/* $NetBSD: linux_types.h,v 1.7 1998/10/03 20:17:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,10 +67,40 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* Note: Machine dependant portions of this file exist. */
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
#ifndef _COMMON_LINUX_TYPES_H
#define _COMMON_LINUX_TYPES_H
#if defined(__i386__)
#include <compat/linux/arch/i386/linux_types.h>
#include <compat/linux/common/linux_olduname.h> /* XXX maybe */
#elif defined(__alpha__)
#include <compat/linux/arch/alpha/linux_types.h>
#include <compat/linux/common/linux_oldmmap.h>
#include <compat/linux/common/linux_oldselect.h>
#include <compat/linux/common/linux_olduname.h>
#include <compat/linux/common/linux_oldolduname.h>
/*
* The rest are not written yet:
*/
#elif defined(__arm32__)
#include <compat/linux/arch/arm32/linux_types.h>
#include <compat/linux/common/linux_oldmmap.h>
#include <compat/linux/common/linux_oldselect.h>
#include <compat/linux/common/linux_olduname.h>
#include <compat/linux/common/linux_oldolduname.h>
#elif defined(__m68k__)
#include <compat/linux/arch/m68k/linux_types.h>
#include <compat/linux/common/linux_oldmmap.h>
#include <compat/linux/common/linux_oldselect.h>
#elif defined(__mips__)
#include <compat/linux/arch/mips/linux_types.h>
#include <compat/linux/common/linux_olduname.h>
#include <compat/linux/common/linux_oldolduname.h>
#elif defined(__powerpc__)
#include <compat/linux/arch/power/linux_types.h>
#include <compat/linux/common/linux_olduname.h>
#include <compat/linux/common/linux_oldolduname.h>
#endif
/*
* Structure for uname(2)
@ -106,4 +136,4 @@ struct linux___sysctl {
unsigned long __unused[4];
};
#endif /* !_COMMON_LINUX_TYPES_H */
#endif /* !_LINUX_TYPES_H */

@ -1,14 +1,11 @@
/* $NetBSD: linux_util.h,v 1.7 1998/10/01 03:54:36 erh Exp $ */
/* $NetBSD: linux_util.h,v 1.8 1998/10/03 20:17:44 christos Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
* Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Eric Haszlakiewicz.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Christos Zoulas.
* by Eric Haszlakiewicz and Christos Zoulas.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -20,8 +17,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
@ -67,8 +64,8 @@
*
*/
#ifndef _COMMON_LINUX_UTIL_H_
#define _COMMON_LINUX_UTIL_H_
#ifndef _LINUX_UTIL_H
#define _LINUX_UTIL_H
#include <compat/common/compat_util.h>
@ -83,4 +80,4 @@ extern const char linux_emul_path[];
#define LINUX_CHECK_ALT_CREAT(p, sgp, path) \
CHECK_ALT_CREAT(p, sgp, linux_emul_path, path)
#endif /* !_COMMON_LINUX_UTIL_H_ */
#endif /* !_LINUX_UTIL_H */

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscall.h,v 1.35 1998/10/01 18:23:37 christos Exp $ */
/* $NetBSD: linux_syscall.h,v 1.36 1998/10/03 20:17:36 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -40,9 +40,9 @@
#define _LINUX_SYSCALL_H
#if defined(__i386__)
#include <compat/linux/i386/linux_syscall.h>
#include <compat/linux/arch/i386/linux_syscall.h>
#elif defined(__alpha__)
#include <compat/linux/alpha/linux_syscall.h>
#include <compat/linux/arch/alpha/linux_syscall.h>
#else
#define LINUX_SYS_MAXSYSCALL 0
#endif

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscallargs.h,v 1.33 1998/10/01 04:20:19 erh Exp $ */
/* $NetBSD: linux_syscallargs.h,v 1.34 1998/10/03 20:17:37 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -40,9 +40,9 @@
#define _LINUX_SYSCALLARGS_H
#if defined(i386)
#include <compat/linux/i386/linux_syscallargs.h>
#include <compat/linux/arch/i386/linux_syscallargs.h>
#elif defined(__alpha__)
#include <compat/linux/alpha/linux_syscallargs.h>
#include <compat/linux/arch/alpha/linux_syscallargs.h>
#else
#error Undefined linux_syscallargs.h machine type.
#endif

@ -1,4 +1,4 @@
/* $NetBSD: linux_syscalls.c,v 1.33 1998/10/01 18:23:38 christos Exp $ */
/* $NetBSD: linux_syscalls.c,v 1.34 1998/10/03 20:17:37 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -39,9 +39,9 @@
/* XXX XXX This exists to keep kdump and friends happy. */
#if defined(__i386__)
#include "../../sys/compat/linux/i386/linux_syscalls.c"
#include "../../sys/compat/linux/arch/i386/linux_syscalls.c"
#elif defined(__alpha__)
#include "../../sys/compat/linux/alpha/linux_syscalls.c"
#include "../../sys/compat/linux/arch/alpha/linux_syscalls.c"
#else
char *linux_syscallnames[] = { 0 };
#endif