From 717f1e459ef63b560b99bd3e038b17c3ec2f5314 Mon Sep 17 00:00:00 2001 From: jlemon Date: Fri, 16 Feb 2001 14:47:24 +0000 Subject: [PATCH] Re-gen auto generated files. --- sys/alpha/linux/linux_proto.h | 21 ++++++++++++++++++++- sys/alpha/linux/linux_syscall.h | 4 +++- sys/alpha/linux/linux_sysent.c | 8 ++++---- sys/i386/linux/linux_proto.h | 19 +++++++++++++++---- sys/i386/linux/linux_syscall.h | 4 ++-- sys/i386/linux/linux_sysent.c | 10 +++++----- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h index 269a24328d06..b77cd12163c8 100644 --- a/sys/alpha/linux/linux_proto.h +++ b/sys/alpha/linux/linux_proto.h @@ -59,8 +59,15 @@ struct linux_lseek_args { long off; char off_[PAD_(long)]; int whence; char whence_[PAD_(int)]; }; +struct linux_mount_args { + char * specialfile; char specialfile_[PAD_(char *)]; + char * dir; char dir_[PAD_(char *)]; + char * filesystemtype; char filesystemtype_[PAD_(char *)]; + u_long rwflag; char rwflag_[PAD_(u_long)]; + void * data; char data_[PAD_(void *)]; +}; struct linux_umount_args { - register_t dummy; + char * path; char path_[PAD_(char *)]; }; struct linux_ptrace_args { register_t dummy; @@ -82,6 +89,10 @@ struct osf1_sigprocmask_args { int how; char how_[PAD_(int)]; u_long mask; char mask_[PAD_(u_long)]; }; +struct linux_umount2_args { + char * path; char path_[PAD_(char *)]; + int flags; char flags_[PAD_(int)]; +}; struct linux_ioctl_args { int fd; char fd_[PAD_(int)]; u_long cmd; char cmd_[PAD_(u_long)]; @@ -358,6 +369,11 @@ struct linux_get_kernel_syms_args { struct linux_ksyslog_args { int what; char what_[PAD_(int)]; }; +struct linux_reboot_args { + int magic1; char magic1_[PAD_(int)]; + int magic2; char magic2_[PAD_(int)]; + int opt; char opt_[PAD_(int)]; +}; struct linux_clone_args { int flags; char flags_[PAD_(int)]; void * stack; char stack_[PAD_(void *)]; @@ -521,12 +537,14 @@ int linux_chmod __P((struct proc *, struct linux_chmod_args *)); int linux_chown __P((struct proc *, struct linux_chown_args *)); int linux_brk __P((struct proc *, struct linux_brk_args *)); int linux_lseek __P((struct proc *, struct linux_lseek_args *)); +int linux_mount __P((struct proc *, struct linux_mount_args *)); int linux_umount __P((struct proc *, struct linux_umount_args *)); int linux_ptrace __P((struct proc *, struct linux_ptrace_args *)); int linux_access __P((struct proc *, struct linux_access_args *)); int linux_kill __P((struct proc *, struct linux_kill_args *)); int linux_open __P((struct proc *, struct linux_open_args *)); int osf1_sigprocmask __P((struct proc *, struct osf1_sigprocmask_args *)); +int linux_umount2 __P((struct proc *, struct linux_umount2_args *)); int linux_ioctl __P((struct proc *, struct linux_ioctl_args *)); int linux_symlink __P((struct proc *, struct linux_symlink_args *)); int linux_readlink __P((struct proc *, struct linux_readlink_args *)); @@ -589,6 +607,7 @@ int linux_init_module __P((struct proc *, struct linux_init_module_args *)); int linux_delete_module __P((struct proc *, struct linux_delete_module_args *)); int linux_get_kernel_syms __P((struct proc *, struct linux_get_kernel_syms_args *)); int linux_ksyslog __P((struct proc *, struct linux_ksyslog_args *)); +int linux_reboot __P((struct proc *, struct linux_reboot_args *)); int linux_clone __P((struct proc *, struct linux_clone_args *)); int linux_uselib __P((struct proc *, struct linux_uselib_args *)); int linux_sysinfo __P((struct proc *, struct linux_sysinfo_args *)); diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h index 64973ce3eeb8..39d9a3d64685 100644 --- a/sys/alpha/linux/linux_syscall.h +++ b/sys/alpha/linux/linux_syscall.h @@ -22,6 +22,7 @@ #define LINUX_SYS_linux_brk 17 #define LINUX_SYS_linux_lseek 19 #define LINUX_SYS_getpid 20 +#define LINUX_SYS_linux_mount 21 #define LINUX_SYS_linux_umount 22 #define LINUX_SYS_setuid 23 #define LINUX_SYS_getuid 24 @@ -36,6 +37,7 @@ #define LINUX_SYS_getgid 47 #define LINUX_SYS_osf1_sigprocmask 48 #define LINUX_SYS_acct 51 +#define LINUX_SYS_linux_umount2 52 #define LINUX_SYS_linux_ioctl 54 #define LINUX_SYS_linux_symlink 57 #define LINUX_SYS_linux_readlink 58 @@ -129,7 +131,7 @@ #define LINUX_SYS_linux_delete_module 308 #define LINUX_SYS_linux_get_kernel_syms 309 #define LINUX_SYS_linux_ksyslog 310 -#define LINUX_SYS_reboot 311 +#define LINUX_SYS_linux_reboot 311 #define LINUX_SYS_linux_clone 312 #define LINUX_SYS_linux_uselib 313 #define LINUX_SYS_mlock 314 diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c index 26f2bc6664b9..f447cc200233 100644 --- a/sys/alpha/linux/linux_sysent.c +++ b/sys/alpha/linux/linux_sysent.c @@ -38,8 +38,8 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)nosys }, /* 18 = */ { AS(linux_lseek_args), (sy_call_t *)linux_lseek }, /* 19 = linux_lseek */ { 0, (sy_call_t *)getpid }, /* 20 = getpid */ - { 0, (sy_call_t *)nosys }, /* 21 = */ - { 0, (sy_call_t *)linux_umount }, /* 22 = linux_umount */ + { AS(linux_mount_args), (sy_call_t *)linux_mount }, /* 21 = linux_mount */ + { AS(linux_umount_args), (sy_call_t *)linux_umount }, /* 22 = linux_umount */ { AS(setuid_args), (sy_call_t *)setuid }, /* 23 = setuid */ { 0, (sy_call_t *)getuid }, /* 24 = getuid */ { 0, (sy_call_t *)nosys }, /* 25 = */ @@ -69,7 +69,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)nosys }, /* 49 = */ { 0, (sy_call_t *)nosys }, /* 50 = */ { AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { 0, (sy_call_t *)nosys }, /* 52 = */ + { AS(linux_umount2_args), (sy_call_t *)linux_umount2 }, /* 52 = linux_umount2 */ { 0, (sy_call_t *)nosys }, /* 53 = */ { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys }, /* 55 = */ @@ -328,7 +328,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)linux_delete_module }, /* 308 = linux_delete_module */ { 0, (sy_call_t *)linux_get_kernel_syms }, /* 309 = linux_get_kernel_syms */ { AS(linux_ksyslog_args), (sy_call_t *)linux_ksyslog }, /* 310 = linux_ksyslog */ - { AS(reboot_args), (sy_call_t *)reboot }, /* 311 = reboot */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot }, /* 311 = linux_reboot */ { AS(linux_clone_args), (sy_call_t *)linux_clone }, /* 312 = linux_clone */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib }, /* 313 = linux_uselib */ { AS(mlock_args), (sy_call_t *)mlock }, /* 314 = mlock */ diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 2a61ac543f30..2df15d0a015e 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.38 2000/11/23 08:53:19 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.39 2001/02/16 14:42:08 jlemon Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -83,10 +83,14 @@ struct linux_lseek_args { int whence; char whence_[PAD_(int)]; }; struct linux_mount_args { - register_t dummy; + char * specialfile; char specialfile_[PAD_(char *)]; + char * dir; char dir_[PAD_(char *)]; + char * filesystemtype; char filesystemtype_[PAD_(char *)]; + u_long rwflag; char rwflag_[PAD_(u_long)]; + void * data; char data_[PAD_(void *)]; }; struct linux_umount_args { - register_t dummy; + char * path; char path_[PAD_(char *)]; }; struct linux_stime_args { register_t dummy; @@ -156,7 +160,8 @@ struct linux_signal_args { linux_handler_t handler; char handler_[PAD_(linux_handler_t)]; }; struct linux_umount2_args { - register_t dummy; + char * path; char path_[PAD_(char *)]; + int flags; char flags_[PAD_(int)]; }; struct linux_lock_args { register_t dummy; @@ -234,6 +239,11 @@ struct linux_readlink_args { struct linux_uselib_args { char * library; char library_[PAD_(char *)]; }; +struct linux_reboot_args { + int magic1; char magic1_[PAD_(int)]; + int magic2; char magic2_[PAD_(int)]; + int opt; char opt_[PAD_(int)]; +}; struct linux_readdir_args { int fd; char fd_[PAD_(int)]; struct linux_dirent * dent; char dent_[PAD_(struct linux_dirent *)]; @@ -602,6 +612,7 @@ int linux_select __P((struct proc *, struct linux_select_args *)); int linux_symlink __P((struct proc *, struct linux_symlink_args *)); int linux_readlink __P((struct proc *, struct linux_readlink_args *)); int linux_uselib __P((struct proc *, struct linux_uselib_args *)); +int linux_reboot __P((struct proc *, struct linux_reboot_args *)); int linux_readdir __P((struct proc *, struct linux_readdir_args *)); int linux_mmap __P((struct proc *, struct linux_mmap_args *)); int linux_truncate __P((struct proc *, struct linux_truncate_args *)); diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index 645438cacd83..c708979344dc 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.38 2000/11/23 08:53:19 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.39 2001/02/16 14:42:08 jlemon Exp */ #define LINUX_SYS_linux_setup 0 @@ -94,7 +94,7 @@ #define LINUX_SYS_linux_readlink 85 #define LINUX_SYS_linux_uselib 86 #define LINUX_SYS_swapon 87 -#define LINUX_SYS_reboot 88 +#define LINUX_SYS_linux_reboot 88 #define LINUX_SYS_linux_readdir 89 #define LINUX_SYS_linux_mmap 90 #define LINUX_SYS_munmap 91 diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index c0dbc7298dc2..ecf0728b3152 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.38 2000/11/23 08:53:19 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.39 2001/02/16 14:42:08 jlemon Exp */ #include "opt_compat.h" @@ -38,8 +38,8 @@ struct sysent linux_sysent[] = { { AS(linux_stat_args), (sy_call_t *)linux_stat }, /* 18 = linux_stat */ { AS(linux_lseek_args), (sy_call_t *)linux_lseek }, /* 19 = linux_lseek */ { 0, (sy_call_t *)getpid }, /* 20 = getpid */ - { 0, (sy_call_t *)linux_mount }, /* 21 = linux_mount */ - { 0, (sy_call_t *)linux_umount }, /* 22 = linux_umount */ + { AS(linux_mount_args), (sy_call_t *)linux_mount }, /* 21 = linux_mount */ + { AS(linux_umount_args), (sy_call_t *)linux_umount }, /* 22 = linux_umount */ { AS(setuid_args), (sy_call_t *)setuid }, /* 23 = setuid */ { 0, (sy_call_t *)getuid }, /* 24 = getuid */ { 0, (sy_call_t *)linux_stime }, /* 25 = linux_stime */ @@ -69,7 +69,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)geteuid }, /* 49 = geteuid */ { 0, (sy_call_t *)getegid }, /* 50 = getegid */ { AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { 0, (sy_call_t *)linux_umount2 }, /* 52 = linux_umount2 */ + { AS(linux_umount2_args), (sy_call_t *)linux_umount2 }, /* 52 = linux_umount2 */ { 0, (sy_call_t *)linux_lock }, /* 53 = linux_lock */ { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl }, /* 54 = linux_ioctl */ { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl }, /* 55 = linux_fcntl */ @@ -105,7 +105,7 @@ struct sysent linux_sysent[] = { { AS(linux_readlink_args), (sy_call_t *)linux_readlink }, /* 85 = linux_readlink */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib }, /* 86 = linux_uselib */ { AS(swapon_args), (sy_call_t *)swapon }, /* 87 = swapon */ - { AS(reboot_args), (sy_call_t *)reboot }, /* 88 = reboot */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot }, /* 88 = linux_reboot */ { AS(linux_readdir_args), (sy_call_t *)linux_readdir }, /* 89 = linux_readdir */ { AS(linux_mmap_args), (sy_call_t *)linux_mmap }, /* 90 = linux_mmap */ { AS(munmap_args), (sy_call_t *)munmap }, /* 91 = munmap */