Subject: Re: Linux emulation using SuSE-7.0
To: =?iso-8859-1?q?Jarom=EDr?= Dolecek <dolecek@ics.muni.cz>
From: Assar Westerlund <assar@netbsd.org>
List: port-i386
Date: 12/28/2000 01:13:57
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit

Jaromír Dolecek <dolecek@ics.muni.cz> writes:
> > Here the debug output for ldconfig...
> > 
> > Core was generated by `ldconfig'.
> > Program terminated with signal 12, Bad system call.
> > #0  0x8053ea0 in __fxstat64 (vers=3, fd=3, buf=0xbfbfd974)
> >     at ../sysdeps/unix/sysv/linux/fxstat64.c:49
> 
> The fxstat64.c seems to just use fstat64(2) syscall which should
> be supported on -current (1.5P). Do you use plain 1.5 or -current ?

Another problem is that modern versions of glibc try calling fstat64()
first and then fstat() if that fails.  The problem with that is that
NetBSD sends SIGSYS signals to Linux programs, which it shouldn't do.
The appended patch seems to fix this for me.  Comments?

/assar

--=-=-=
Content-Disposition: attachment; filename=netbsd-linux.diff

Index: compat/linux/arch/alpha/linux_syscallargs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/alpha/linux_syscallargs.h,v
retrieving revision 1.32
diff -u -w -r1.32 linux_syscallargs.h
--- compat/linux/arch/alpha/linux_syscallargs.h	2000/12/21 20:42:42	1.32
+++ compat/linux/arch/alpha/linux_syscallargs.h	2000/12/28 00:09:00
@@ -508,7 +508,7 @@
  * System call prototypes.
  */
 
-int	sys_nosys(struct proc *, void *, register_t *);
+int	linux_sys_nosys(struct proc *, void *, register_t *);
 int	sys_exit(struct proc *, void *, register_t *);
 int	sys_fork(struct proc *, void *, register_t *);
 int	sys_read(struct proc *, void *, register_t *);
Index: compat/linux/arch/alpha/linux_sysent.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/alpha/linux_sysent.c,v
retrieving revision 1.33
diff -u -w -r1.33 linux_sysent.c
--- compat/linux/arch/alpha/linux_sysent.c	2000/12/21 20:42:42	1.33
+++ compat/linux/arch/alpha/linux_sysent.c	2000/12/28 00:09:01
@@ -32,7 +32,7 @@
 
 struct sysent linux_sysent[] = {
 	{ 0, 0,
-	    sys_nosys },			/* 0 = syscall */
+	    linux_sys_nosys },			/* 0 = syscall */
 	{ 1, s(struct sys_exit_args),
 	    sys_exit },				/* 1 = exit */
 	{ 0, 0,
@@ -42,7 +42,7 @@
 	{ 3, s(struct sys_write_args),
 	    sys_write },			/* 4 = write */
 	{ 0, 0,
-	    sys_nosys },			/* 5 = unimplemented */
+	    linux_sys_nosys },			/* 5 = unimplemented */
 	{ 1, s(struct sys_close_args),
 	    sys_close },			/* 6 = close */
 	{ 4, s(struct osf1_sys_wait4_args),
@@ -54,7 +54,7 @@
 	{ 1, s(struct linux_sys_unlink_args),
 	    linux_sys_unlink },			/* 10 = unlink */
 	{ 0, 0,
-	    sys_nosys },			/* 11 = unimplemented */
+	    linux_sys_nosys },			/* 11 = unimplemented */
 	{ 1, s(struct linux_sys_chdir_args),
 	    linux_sys_chdir },			/* 12 = chdir */
 	{ 1, s(struct sys_fchdir_args),
@@ -68,7 +68,7 @@
 	{ 1, s(struct linux_sys_brk_args),
 	    linux_sys_brk },			/* 17 = brk */
 	{ 0, 0,
-	    sys_nosys },			/* 18 = unimplemented */
+	    linux_sys_nosys },			/* 18 = unimplemented */
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43_sys_lseek },		/* 19 = lseek */
 	{ 0, 0,
@@ -76,43 +76,43 @@
 	{ 4, s(struct osf1_sys_mount_args),
 	    osf1_sys_mount },			/* 21 = mount */
 	{ 0, 0,
-	    sys_nosys },			/* 22 = unimplemented umount */
+	    linux_sys_nosys },			/* 22 = unimplemented umount */
 	{ 1, s(struct sys_setuid_args),
 	    sys_setuid },			/* 23 = setuid */
 	{ 0, 0,
 	    sys_getuid_with_euid },		/* 24 = getuid_with_euid */
 	{ 0, 0,
-	    sys_nosys },			/* 25 = unimplemented */
+	    linux_sys_nosys },			/* 25 = unimplemented */
 	{ 4, s(struct linux_sys_ptrace_args),
 	    linux_sys_ptrace },			/* 26 = ptrace */
 	{ 0, 0,
-	    sys_nosys },			/* 27 = unimplemented */
+	    linux_sys_nosys },			/* 27 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 28 = unimplemented */
+	    linux_sys_nosys },			/* 28 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 29 = unimplemented */
+	    linux_sys_nosys },			/* 29 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 30 = unimplemented */
+	    linux_sys_nosys },			/* 30 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 31 = unimplemented */
+	    linux_sys_nosys },			/* 31 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 32 = unimplemented */
+	    linux_sys_nosys },			/* 32 = unimplemented */
 	{ 2, s(struct linux_sys_access_args),
 	    linux_sys_access },			/* 33 = access */
 	{ 0, 0,
-	    sys_nosys },			/* 34 = unimplemented */
+	    linux_sys_nosys },			/* 34 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 35 = unimplemented */
+	    linux_sys_nosys },			/* 35 = unimplemented */
 	{ 0, 0,
 	    sys_sync },				/* 36 = sync */
 	{ 2, s(struct linux_sys_kill_args),
 	    linux_sys_kill },			/* 37 = kill */
 	{ 0, 0,
-	    sys_nosys },			/* 38 = unimplemented */
+	    linux_sys_nosys },			/* 38 = unimplemented */
 	{ 2, s(struct sys_setpgid_args),
 	    sys_setpgid },			/* 39 = setpgid */
 	{ 0, 0,
-	    sys_nosys },			/* 40 = unimplemented */
+	    linux_sys_nosys },			/* 40 = unimplemented */
 	{ 1, s(struct sys_dup_args),
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0,
@@ -120,31 +120,31 @@
 	{ 4, s(struct osf1_sys_set_program_attributes_args),
 	    osf1_sys_set_program_attributes },	/* 43 = set_program_attributes */
 	{ 0, 0,
-	    sys_nosys },			/* 44 = unimplemented */
+	    linux_sys_nosys },			/* 44 = unimplemented */
 	{ 3, s(struct linux_sys_open_args),
 	    linux_sys_open },			/* 45 = open */
 	{ 0, 0,
-	    sys_nosys },			/* 46 = unimplemented */
+	    linux_sys_nosys },			/* 46 = unimplemented */
 	{ 0, 0,
 	    sys_getgid_with_egid },		/* 47 = getgid_with_egid */
 	{ 2, s(struct compat_13_sys_sigprocmask_args),
 	    compat_13_sys_sigprocmask },	/* 48 = sigprocmask */
 	{ 0, 0,
-	    sys_nosys },			/* 49 = unimplemented */
+	    linux_sys_nosys },			/* 49 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 50 = unimplemented */
+	    linux_sys_nosys },			/* 50 = unimplemented */
 	{ 1, s(struct sys_acct_args),
 	    sys_acct },				/* 51 = acct */
 	{ 1, s(struct linux_sys_sigpending_args),
 	    linux_sys_sigpending },		/* 52 = sigpending */
 	{ 0, 0,
-	    sys_nosys },			/* 53 = unimplemented */
+	    linux_sys_nosys },			/* 53 = unimplemented */
 	{ 3, s(struct linux_sys_ioctl_args),
 	    linux_sys_ioctl },			/* 54 = ioctl */
 	{ 0, 0,
-	    sys_nosys },			/* 55 = unimplemented */
+	    linux_sys_nosys },			/* 55 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 56 = unimplemented */
+	    linux_sys_nosys },			/* 56 = unimplemented */
 	{ 2, s(struct linux_sys_symlink_args),
 	    linux_sys_symlink },		/* 57 = symlink */
 	{ 3, s(struct linux_sys_readlink_args),
@@ -156,13 +156,13 @@
 	{ 1, s(struct sys_chroot_args),
 	    sys_chroot },			/* 61 = chroot */
 	{ 0, 0,
-	    sys_nosys },			/* 62 = unimplemented */
+	    linux_sys_nosys },			/* 62 = unimplemented */
 	{ 0, 0,
 	    sys_getpgrp },			/* 63 = getpgrp */
 	{ 0, 0,
 	    compat_43_sys_getpagesize },	/* 64 = getpagesize */
 	{ 0, 0,
-	    sys_nosys },			/* 65 = unimplemented */
+	    linux_sys_nosys },			/* 65 = unimplemented */
 	{ 0, 0,
 	    sys___vfork14 },			/* 66 = __vfork14 */
 	{ 2, s(struct linux_sys_stat_args),
@@ -170,47 +170,47 @@
 	{ 2, s(struct linux_sys_lstat_args),
 	    linux_sys_lstat },			/* 68 = lstat */
 	{ 0, 0,
-	    sys_nosys },			/* 69 = unimplemented */
+	    linux_sys_nosys },			/* 69 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 70 = unimplemented */
+	    linux_sys_nosys },			/* 70 = unimplemented */
 	{ 6, s(struct linux_sys_mmap_args),
 	    linux_sys_mmap },			/* 71 = mmap */
 	{ 0, 0,
-	    sys_nosys },			/* 72 = unimplemented */
+	    linux_sys_nosys },			/* 72 = unimplemented */
 	{ 2, s(struct sys_munmap_args),
 	    sys_munmap },			/* 73 = munmap */
 	{ 3, s(struct sys_mprotect_args),
 	    sys_mprotect },			/* 74 = mprotect */
 	{ 0, 0,
-	    sys_nosys },			/* 75 = unimplemented madvise */
+	    linux_sys_nosys },			/* 75 = unimplemented madvise */
 	{ 0, 0,
-	    sys_nosys },			/* 76 = unimplemented vhangup */
+	    linux_sys_nosys },			/* 76 = unimplemented vhangup */
 	{ 0, 0,
-	    sys_nosys },			/* 77 = unimplemented */
+	    linux_sys_nosys },			/* 77 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 78 = unimplemented */
+	    linux_sys_nosys },			/* 78 = unimplemented */
 	{ 2, s(struct sys_getgroups_args),
 	    sys_getgroups },			/* 79 = getgroups */
 	{ 2, s(struct sys_setgroups_args),
 	    sys_setgroups },			/* 80 = setgroups */
 	{ 0, 0,
-	    sys_nosys },			/* 81 = unimplemented */
+	    linux_sys_nosys },			/* 81 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 82 = unimplemented setpgrp */
+	    linux_sys_nosys },			/* 82 = unimplemented setpgrp */
 	{ 3, s(struct osf1_sys_setitimer_args),
 	    osf1_sys_setitimer },		/* 83 = setitimer */
 	{ 0, 0,
-	    sys_nosys },			/* 84 = unimplemented */
+	    linux_sys_nosys },			/* 84 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 85 = unimplemented */
+	    linux_sys_nosys },			/* 85 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 86 = unimplemented osf1_sys_getitimer */
+	    linux_sys_nosys },			/* 86 = unimplemented osf1_sys_getitimer */
 	{ 2, s(struct compat_43_sys_gethostname_args),
 	    compat_43_sys_gethostname },	/* 87 = gethostname */
 	{ 2, s(struct compat_43_sys_sethostname_args),
 	    compat_43_sys_sethostname },	/* 88 = sethostname */
 	{ 0, 0,
-	    sys_nosys },			/* 89 = unimplemented getdtablesize */
+	    linux_sys_nosys },			/* 89 = unimplemented getdtablesize */
 	{ 2, s(struct sys_dup2_args),
 	    sys_dup2 },				/* 90 = dup2 */
 	{ 2, s(struct linux_sys_fstat_args),
@@ -246,13 +246,13 @@
 	{ 2, s(struct sys_listen_args),
 	    sys_listen },			/* 106 = listen */
 	{ 0, 0,
-	    sys_nosys },			/* 107 = unimplemented */
+	    linux_sys_nosys },			/* 107 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 108 = unimplemented */
+	    linux_sys_nosys },			/* 108 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 109 = unimplemented */
+	    linux_sys_nosys },			/* 109 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 110 = unimplemented */
+	    linux_sys_nosys },			/* 110 = unimplemented */
 	{ 3, s(struct linux_sys_sigsuspend_args),
 	    linux_sys_sigsuspend },		/* 111 = sigsuspend */
 	{ 2, s(struct compat_43_sys_sigstack_args),
@@ -262,7 +262,7 @@
 	{ 3, s(struct sys_sendmsg_args),
 	    sys_sendmsg },			/* 114 = sendmsg */
 	{ 0, 0,
-	    sys_nosys },			/* 115 = unimplemented */
+	    linux_sys_nosys },			/* 115 = unimplemented */
 	{ 2, s(struct osf1_sys_gettimeofday_args),
 	    osf1_sys_gettimeofday },		/* 116 = gettimeofday */
 	{ 2, s(struct osf1_sys_getrusage_args),
@@ -270,7 +270,7 @@
 	{ 5, s(struct linux_sys_getsockopt_args),
 	    linux_sys_getsockopt },		/* 118 = getsockopt */
 	{ 0, 0,
-	    sys_nosys },			/* 119 = unimplemented */
+	    linux_sys_nosys },			/* 119 = unimplemented */
 	{ 3, s(struct sys_readv_args),
 	    sys_readv },			/* 120 = readv */
 	{ 3, s(struct sys_writev_args),
@@ -310,45 +310,45 @@
 	{ 2, s(struct osf1_sys_utimes_args),
 	    osf1_sys_utimes },			/* 138 = utimes */
 	{ 0, 0,
-	    sys_nosys },			/* 139 = unimplemented */
+	    linux_sys_nosys },			/* 139 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 140 = unimplemented */
+	    linux_sys_nosys },			/* 140 = unimplemented */
 	{ 3, s(struct compat_43_sys_getpeername_args),
 	    compat_43_sys_getpeername },	/* 141 = getpeername */
 	{ 0, 0,
-	    sys_nosys },			/* 142 = unimplemented */
+	    linux_sys_nosys },			/* 142 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 143 = unimplemented */
+	    linux_sys_nosys },			/* 143 = unimplemented */
 	{ 2, s(struct compat_43_sys_getrlimit_args),
 	    compat_43_sys_getrlimit },		/* 144 = getrlimit */
 	{ 2, s(struct compat_43_sys_setrlimit_args),
 	    compat_43_sys_setrlimit },		/* 145 = setrlimit */
 	{ 0, 0,
-	    sys_nosys },			/* 146 = unimplemented */
+	    linux_sys_nosys },			/* 146 = unimplemented */
 	{ 0, 0,
 	    sys_setsid },			/* 147 = setsid */
 	{ 0, 0,
-	    sys_nosys },			/* 148 = unimplemented quotactl */
+	    linux_sys_nosys },			/* 148 = unimplemented quotactl */
 	{ 0, 0,
-	    sys_nosys },			/* 149 = unimplemented */
+	    linux_sys_nosys },			/* 149 = unimplemented */
 	{ 3, s(struct compat_43_sys_getsockname_args),
 	    compat_43_sys_getsockname },	/* 150 = getsockname */
 	{ 0, 0,
-	    sys_nosys },			/* 151 = unimplemented */
+	    linux_sys_nosys },			/* 151 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 152 = unimplemented */
+	    linux_sys_nosys },			/* 152 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 153 = unimplemented */
+	    linux_sys_nosys },			/* 153 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 154 = unimplemented */
+	    linux_sys_nosys },			/* 154 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 155 = unimplemented */
+	    linux_sys_nosys },			/* 155 = unimplemented */
 	{ 3, s(struct linux_sys_sigaction_args),
 	    linux_sys_sigaction },		/* 156 = sigaction */
 	{ 0, 0,
-	    sys_nosys },			/* 157 = unimplemented */
+	    linux_sys_nosys },			/* 157 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 158 = unimplemented */
+	    linux_sys_nosys },			/* 158 = unimplemented */
 	{ 4, s(struct compat_43_sys_getdirentries_args),
 	    compat_43_sys_getdirentries },	/* 159 = getdirentries */
 	{ 3, s(struct osf1_sys_statfs_args),
@@ -356,81 +356,81 @@
 	{ 3, s(struct osf1_sys_fstatfs_args),
 	    osf1_sys_fstatfs },			/* 161 = fstatfs */
 	{ 0, 0,
-	    sys_nosys },			/* 162 = unimplemented */
+	    linux_sys_nosys },			/* 162 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 163 = unimplemented */
+	    linux_sys_nosys },			/* 163 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 164 = unimplemented */
+	    linux_sys_nosys },			/* 164 = unimplemented */
 	{ 2, s(struct compat_09_sys_getdomainname_args),
 	    compat_09_sys_getdomainname },	/* 165 = getdomainname */
 	{ 2, s(struct linux_sys_setdomainname_args),
 	    linux_sys_setdomainname },		/* 166 = setdomainname */
 	{ 0, 0,
-	    sys_nosys },			/* 167 = unimplemented */
+	    linux_sys_nosys },			/* 167 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 168 = unimplemented */
+	    linux_sys_nosys },			/* 168 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 169 = unimplemented */
+	    linux_sys_nosys },			/* 169 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 170 = unimplemented */
+	    linux_sys_nosys },			/* 170 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 171 = unimplemented */
+	    linux_sys_nosys },			/* 171 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 172 = unimplemented */
+	    linux_sys_nosys },			/* 172 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 173 = unimplemented */
+	    linux_sys_nosys },			/* 173 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 174 = unimplemented */
+	    linux_sys_nosys },			/* 174 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 175 = unimplemented */
+	    linux_sys_nosys },			/* 175 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 176 = unimplemented */
+	    linux_sys_nosys },			/* 176 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 177 = unimplemented */
+	    linux_sys_nosys },			/* 177 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 178 = unimplemented */
+	    linux_sys_nosys },			/* 178 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 179 = unimplemented */
+	    linux_sys_nosys },			/* 179 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 180 = unimplemented */
+	    linux_sys_nosys },			/* 180 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 181 = unimplemented */
+	    linux_sys_nosys },			/* 181 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 182 = unimplemented */
+	    linux_sys_nosys },			/* 182 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 183 = unimplemented */
+	    linux_sys_nosys },			/* 183 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 184 = unimplemented */
+	    linux_sys_nosys },			/* 184 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 185 = unimplemented */
+	    linux_sys_nosys },			/* 185 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 186 = unimplemented */
+	    linux_sys_nosys },			/* 186 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 187 = unimplemented */
+	    linux_sys_nosys },			/* 187 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 188 = unimplemented */
+	    linux_sys_nosys },			/* 188 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 189 = unimplemented */
+	    linux_sys_nosys },			/* 189 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 190 = unimplemented */
+	    linux_sys_nosys },			/* 190 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 191 = unimplemented */
+	    linux_sys_nosys },			/* 191 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 192 = unimplemented */
+	    linux_sys_nosys },			/* 192 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 193 = unimplemented */
+	    linux_sys_nosys },			/* 193 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 194 = unimplemented */
+	    linux_sys_nosys },			/* 194 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 195 = unimplemented */
+	    linux_sys_nosys },			/* 195 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 196 = unimplemented */
+	    linux_sys_nosys },			/* 196 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 197 = unimplemented */
+	    linux_sys_nosys },			/* 197 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 198 = unimplemented */
+	    linux_sys_nosys },			/* 198 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 199 = unimplemented osf1_sys_swapon */
+	    linux_sys_nosys },			/* 199 = unimplemented osf1_sys_swapon */
 #ifdef SYSVMSG
 	{ 3, s(struct linux_sys_msgctl_args),
 	    linux_sys_msgctl },			/* 200 = msgctl */
@@ -442,13 +442,13 @@
 	    sys_msgsnd },			/* 203 = msgsnd */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 200 = unimplemented msgctl */
+	    linux_sys_nosys },			/* 200 = unimplemented msgctl */
 	{ 0, 0,
-	    sys_nosys },			/* 201 = unimplemented msgget */
+	    linux_sys_nosys },			/* 201 = unimplemented msgget */
 	{ 0, 0,
-	    sys_nosys },			/* 202 = unimplemented msgrcv */
+	    linux_sys_nosys },			/* 202 = unimplemented msgrcv */
 	{ 0, 0,
-	    sys_nosys },			/* 203 = unimplemented msgsnd */
+	    linux_sys_nosys },			/* 203 = unimplemented msgsnd */
 #endif
 #ifdef SYSVSEM
 	{ 4, s(struct linux_sys_semctl_args),
@@ -459,11 +459,11 @@
 	    sys_semop },			/* 206 = semop */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 204 = unimplemented semctl */
+	    linux_sys_nosys },			/* 204 = unimplemented semctl */
 	{ 0, 0,
-	    sys_nosys },			/* 205 = unimplemented semget */
+	    linux_sys_nosys },			/* 205 = unimplemented semget */
 	{ 0, 0,
-	    sys_nosys },			/* 206 = unimplemented semop */
+	    linux_sys_nosys },			/* 206 = unimplemented semop */
 #endif
 	{ 1, s(struct linux_sys_olduname_args),
 	    linux_sys_olduname },		/* 207 = olduname */
@@ -480,210 +480,210 @@
 	    sys_shmget },			/* 212 = shmget */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 209 = unimplemented shmat */
+	    linux_sys_nosys },			/* 209 = unimplemented shmat */
 	{ 0, 0,
-	    sys_nosys },			/* 210 = unimplemented shmctl */
+	    linux_sys_nosys },			/* 210 = unimplemented shmctl */
 	{ 0, 0,
-	    sys_nosys },			/* 211 = unimplemented shmdt */
+	    linux_sys_nosys },			/* 211 = unimplemented shmdt */
 	{ 0, 0,
-	    sys_nosys },			/* 212 = unimplemented shmget */
+	    linux_sys_nosys },			/* 212 = unimplemented shmget */
 #endif
 	{ 0, 0,
-	    sys_nosys },			/* 213 = unimplemented */
+	    linux_sys_nosys },			/* 213 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 214 = unimplemented */
+	    linux_sys_nosys },			/* 214 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 215 = unimplemented */
+	    linux_sys_nosys },			/* 215 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 216 = unimplemented */
+	    linux_sys_nosys },			/* 216 = unimplemented */
 	{ 3, s(struct linux_sys_msync_args),
 	    linux_sys_msync },			/* 217 = msync */
 	{ 0, 0,
-	    sys_nosys },			/* 218 = unimplemented */
+	    linux_sys_nosys },			/* 218 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 219 = unimplemented */
+	    linux_sys_nosys },			/* 219 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 220 = unimplemented */
+	    linux_sys_nosys },			/* 220 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 221 = unimplemented */
+	    linux_sys_nosys },			/* 221 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 222 = unimplemented */
+	    linux_sys_nosys },			/* 222 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 223 = unimplemented */
+	    linux_sys_nosys },			/* 223 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 224 = unimplemented */
+	    linux_sys_nosys },			/* 224 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 225 = unimplemented */
+	    linux_sys_nosys },			/* 225 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 226 = unimplemented */
+	    linux_sys_nosys },			/* 226 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 227 = unimplemented */
+	    linux_sys_nosys },			/* 227 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 228 = unimplemented */
+	    linux_sys_nosys },			/* 228 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 229 = unimplemented */
+	    linux_sys_nosys },			/* 229 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 230 = unimplemented */
+	    linux_sys_nosys },			/* 230 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 231 = unimplemented */
+	    linux_sys_nosys },			/* 231 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 232 = unimplemented */
+	    linux_sys_nosys },			/* 232 = unimplemented */
 	{ 1, s(struct linux_sys_getpgid_args),
 	    linux_sys_getpgid },		/* 233 = getpgid */
 	{ 1, s(struct sys_getsid_args),
 	    sys_getsid },			/* 234 = getsid */
 	{ 0, 0,
-	    sys_nosys },			/* 235 = unimplemented sigaltstack */
+	    linux_sys_nosys },			/* 235 = unimplemented sigaltstack */
 	{ 0, 0,
-	    sys_nosys },			/* 236 = unimplemented */
+	    linux_sys_nosys },			/* 236 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 237 = unimplemented */
+	    linux_sys_nosys },			/* 237 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 238 = unimplemented */
+	    linux_sys_nosys },			/* 238 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 239 = unimplemented */
+	    linux_sys_nosys },			/* 239 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 240 = unimplemented */
+	    linux_sys_nosys },			/* 240 = unimplemented */
 	{ 3, s(struct osf1_sys_sysinfo_args),
 	    osf1_sys_sysinfo },			/* 241 = sysinfo */
 	{ 0, 0,
-	    sys_nosys },			/* 242 = unimplemented */
+	    linux_sys_nosys },			/* 242 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 243 = unimplemented */
+	    linux_sys_nosys },			/* 243 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 244 = unimplemented osf1_sys_proplist_syscall */
+	    linux_sys_nosys },			/* 244 = unimplemented osf1_sys_proplist_syscall */
 	{ 0, 0,
-	    sys_nosys },			/* 245 = unimplemented */
+	    linux_sys_nosys },			/* 245 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 246 = unimplemented */
+	    linux_sys_nosys },			/* 246 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 247 = unimplemented */
+	    linux_sys_nosys },			/* 247 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 248 = unimplemented */
+	    linux_sys_nosys },			/* 248 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 249 = unimplemented */
+	    linux_sys_nosys },			/* 249 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 250 = unimplemented */
+	    linux_sys_nosys },			/* 250 = unimplemented */
 	{ 2, s(struct osf1_sys_usleep_thread_args),
 	    osf1_sys_usleep_thread },		/* 251 = usleep_thread */
 	{ 0, 0,
-	    sys_nosys },			/* 252 = unimplemented */
+	    linux_sys_nosys },			/* 252 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 253 = unimplemented */
+	    linux_sys_nosys },			/* 253 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 254 = unimplemented */
+	    linux_sys_nosys },			/* 254 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 255 = unimplemented sysfs */
+	    linux_sys_nosys },			/* 255 = unimplemented sysfs */
 	{ 5, s(struct osf1_sys_getsysinfo_args),
 	    osf1_sys_getsysinfo },		/* 256 = getsysinfo */
 	{ 5, s(struct osf1_sys_setsysinfo_args),
 	    osf1_sys_setsysinfo },		/* 257 = setsysinfo */
 	{ 0, 0,
-	    sys_nosys },			/* 258 = unimplemented */
+	    linux_sys_nosys },			/* 258 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 259 = unimplemented */
+	    linux_sys_nosys },			/* 259 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 260 = unimplemented */
+	    linux_sys_nosys },			/* 260 = unimplemented */
 	{ 1, s(struct linux_sys_fdatasync_args),
 	    linux_sys_fdatasync },		/* 261 = fdatasync */
 	{ 0, 0,
-	    sys_nosys },			/* 262 = unimplemented */
+	    linux_sys_nosys },			/* 262 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 263 = unimplemented */
+	    linux_sys_nosys },			/* 263 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 264 = unimplemented */
+	    linux_sys_nosys },			/* 264 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 265 = unimplemented */
+	    linux_sys_nosys },			/* 265 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 266 = unimplemented */
+	    linux_sys_nosys },			/* 266 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 267 = unimplemented */
+	    linux_sys_nosys },			/* 267 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 268 = unimplemented */
+	    linux_sys_nosys },			/* 268 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 269 = unimplemented */
+	    linux_sys_nosys },			/* 269 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 270 = unimplemented */
+	    linux_sys_nosys },			/* 270 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 271 = unimplemented */
+	    linux_sys_nosys },			/* 271 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 272 = unimplemented */
+	    linux_sys_nosys },			/* 272 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 273 = unimplemented */
+	    linux_sys_nosys },			/* 273 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 274 = unimplemented */
+	    linux_sys_nosys },			/* 274 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 275 = unimplemented */
+	    linux_sys_nosys },			/* 275 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 276 = unimplemented */
+	    linux_sys_nosys },			/* 276 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 277 = unimplemented */
+	    linux_sys_nosys },			/* 277 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 278 = unimplemented */
+	    linux_sys_nosys },			/* 278 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 279 = unimplemented */
+	    linux_sys_nosys },			/* 279 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 280 = unimplemented */
+	    linux_sys_nosys },			/* 280 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 281 = unimplemented */
+	    linux_sys_nosys },			/* 281 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 282 = unimplemented */
+	    linux_sys_nosys },			/* 282 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 283 = unimplemented */
+	    linux_sys_nosys },			/* 283 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 284 = unimplemented */
+	    linux_sys_nosys },			/* 284 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 285 = unimplemented */
+	    linux_sys_nosys },			/* 285 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 286 = unimplemented */
+	    linux_sys_nosys },			/* 286 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 287 = unimplemented */
+	    linux_sys_nosys },			/* 287 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 288 = unimplemented */
+	    linux_sys_nosys },			/* 288 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 289 = unimplemented */
+	    linux_sys_nosys },			/* 289 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 290 = unimplemented */
+	    linux_sys_nosys },			/* 290 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 291 = unimplemented */
+	    linux_sys_nosys },			/* 291 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 292 = unimplemented */
+	    linux_sys_nosys },			/* 292 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 293 = unimplemented */
+	    linux_sys_nosys },			/* 293 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 294 = unimplemented */
+	    linux_sys_nosys },			/* 294 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 295 = unimplemented */
+	    linux_sys_nosys },			/* 295 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 296 = unimplemented */
+	    linux_sys_nosys },			/* 296 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 297 = unimplemented */
+	    linux_sys_nosys },			/* 297 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 298 = unimplemented */
+	    linux_sys_nosys },			/* 298 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 299 = unimplemented */
+	    linux_sys_nosys },			/* 299 = unimplemented */
 	{ 0, 0,
-	    sys_nosys },			/* 300 = unimplemented bdflush */
+	    linux_sys_nosys },			/* 300 = unimplemented bdflush */
 	{ 0, 0,
-	    sys_nosys },			/* 301 = unimplemented sethae */
+	    linux_sys_nosys },			/* 301 = unimplemented sethae */
 	{ 0, 0,
-	    sys_nosys },			/* 302 = unimplemented mount */
+	    linux_sys_nosys },			/* 302 = unimplemented mount */
 	{ 0, 0,
-	    sys_nosys },			/* 303 = unimplemented old_adjtimex */
+	    linux_sys_nosys },			/* 303 = unimplemented old_adjtimex */
 	{ 1, s(struct linux_sys_swapoff_args),
 	    linux_sys_swapoff },		/* 304 = swapoff */
 	{ 3, s(struct linux_sys_getdents_args),
 	    linux_sys_getdents },		/* 305 = getdents */
 	{ 0, 0,
-	    sys_nosys },			/* 306 = unimplemented alpha_create_module */
+	    linux_sys_nosys },			/* 306 = unimplemented alpha_create_module */
 	{ 0, 0,
-	    sys_nosys },			/* 307 = unimplemented init_module */
+	    linux_sys_nosys },			/* 307 = unimplemented init_module */
 	{ 0, 0,
-	    sys_nosys },			/* 308 = unimplemented delete_module */
+	    linux_sys_nosys },			/* 308 = unimplemented delete_module */
 	{ 0, 0,
-	    sys_nosys },			/* 309 = unimplemented get_kernel_syms */
+	    linux_sys_nosys },			/* 309 = unimplemented get_kernel_syms */
 	{ 0, 0,
-	    sys_nosys },			/* 310 = unimplemented syslog */
+	    linux_sys_nosys },			/* 310 = unimplemented syslog */
 	{ 4, s(struct linux_sys_reboot_args),
 	    linux_sys_reboot },			/* 311 = reboot */
 	{ 2, s(struct linux_sys_clone_args),
@@ -693,7 +693,7 @@
 	    linux_sys_uselib },			/* 313 = uselib */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 313 = unimplemented sys_uselib */
+	    linux_sys_nosys },			/* 313 = unimplemented sys_uselib */
 #endif
 	{ 2, s(struct sys_mlock_args),
 	    sys_mlock },			/* 314 = mlock */
@@ -708,9 +708,9 @@
 	{ 1, s(struct linux_sys___sysctl_args),
 	    linux_sys___sysctl },		/* 319 = __sysctl */
 	{ 0, 0,
-	    sys_nosys },			/* 320 = unimplemented idle */
+	    linux_sys_nosys },			/* 320 = unimplemented idle */
 	{ 0, 0,
-	    sys_nosys },			/* 321 = unimplemented oldumount */
+	    linux_sys_nosys },			/* 321 = unimplemented oldumount */
 	{ 1, s(struct linux_sys_swapon_args),
 	    linux_sys_swapon },			/* 322 = swapon */
 	{ 1, s(struct linux_sys_times_args),
@@ -720,9 +720,9 @@
 	{ 1, s(struct linux_sys_setfsuid_args),
 	    linux_sys_setfsuid },		/* 325 = setfsuid */
 	{ 0, 0,
-	    sys_nosys },			/* 326 = unimplemented setfsgid */
+	    linux_sys_nosys },			/* 326 = unimplemented setfsgid */
 	{ 0, 0,
-	    sys_nosys },			/* 327 = unimplemented ustat */
+	    linux_sys_nosys },			/* 327 = unimplemented ustat */
 	{ 2, s(struct linux_sys_statfs_args),
 	    linux_sys_statfs },			/* 328 = statfs */
 	{ 2, s(struct linux_sys_fstatfs_args),
@@ -742,9 +742,9 @@
 	{ 1, s(struct linux_sys_sched_get_priority_min_args),
 	    linux_sys_sched_get_priority_min },	/* 336 = sched_get_priority_min */
 	{ 0, 0,
-	    sys_nosys },			/* 337 = unimplemented sched_rr_get_interval */
+	    linux_sys_nosys },			/* 337 = unimplemented sched_rr_get_interval */
 	{ 0, 0,
-	    sys_nosys },			/* 338 = unimplemented afs_syscall */
+	    linux_sys_nosys },			/* 338 = unimplemented afs_syscall */
 	{ 1, s(struct linux_sys_uname_args),
 	    linux_sys_uname },			/* 339 = uname */
 	{ 2, s(struct sys_nanosleep_args),
@@ -752,19 +752,19 @@
 	{ 4, s(struct linux_sys_mremap_args),
 	    linux_sys_mremap },			/* 341 = mremap */
 	{ 0, 0,
-	    sys_nosys },			/* 342 = unimplemented nfsservctl */
+	    linux_sys_nosys },			/* 342 = unimplemented nfsservctl */
 	{ 3, s(struct linux_sys_setresuid_args),
 	    linux_sys_setresuid },		/* 343 = setresuid */
 	{ 3, s(struct linux_sys_getresuid_args),
 	    linux_sys_getresuid },		/* 344 = getresuid */
 	{ 0, 0,
-	    sys_nosys },			/* 345 = unimplemented pciconfig_read */
+	    linux_sys_nosys },			/* 345 = unimplemented pciconfig_read */
 	{ 0, 0,
-	    sys_nosys },			/* 346 = unimplemented pciconfig_write */
+	    linux_sys_nosys },			/* 346 = unimplemented pciconfig_write */
 	{ 0, 0,
-	    sys_nosys },			/* 347 = unimplemented query_module */
+	    linux_sys_nosys },			/* 347 = unimplemented query_module */
 	{ 0, 0,
-	    sys_nosys },			/* 348 = unimplemented prctl */
+	    linux_sys_nosys },			/* 348 = unimplemented prctl */
 	{ 4, s(struct linux_sys_pread_args),
 	    linux_sys_pread },			/* 349 = pread */
 	{ 4, s(struct linux_sys_pwrite_args),
@@ -778,7 +778,7 @@
 	{ 2, s(struct linux_sys_rt_sigpending_args),
 	    linux_sys_rt_sigpending },		/* 354 = rt_sigpending */
 	{ 0, 0,
-	    sys_nosys },			/* 355 = unimplemented rt_sigtimedwait */
+	    linux_sys_nosys },			/* 355 = unimplemented rt_sigtimedwait */
 	{ 3, s(struct linux_sys_rt_queueinfo_args),
 	    linux_sys_rt_queueinfo },		/* 356 = rt_queueinfo */
 	{ 2, s(struct linux_sys_rt_sigsuspend_args),
@@ -800,296 +800,296 @@
 	{ 4, s(struct linux_sys_wait4_args),
 	    linux_sys_wait4 },			/* 365 = wait4 */
 	{ 0, 0,
-	    sys_nosys },			/* 366 = unimplemented adjtimex */
+	    linux_sys_nosys },			/* 366 = unimplemented adjtimex */
 	{ 2, s(struct sys___getcwd_args),
 	    sys___getcwd },			/* 367 = __getcwd */
 	{ 0, 0,
-	    sys_nosys },			/* 368 = unimplemented capget */
+	    linux_sys_nosys },			/* 368 = unimplemented capget */
 	{ 0, 0,
-	    sys_nosys },			/* 369 = unimplemented capset */
+	    linux_sys_nosys },			/* 369 = unimplemented capset */
 	{ 0, 0,
-	    sys_nosys },			/* 370 = unimplemented sendfile */
+	    linux_sys_nosys },			/* 370 = unimplemented sendfile */
 	{ 0, 0,
-	    sys_nosys },			/* 371 = unimplemented setresgid */
+	    linux_sys_nosys },			/* 371 = unimplemented setresgid */
 	{ 0, 0,
-	    sys_nosys },			/* 372 = unimplemented getresgid */
+	    linux_sys_nosys },			/* 372 = unimplemented getresgid */
 	{ 0, 0,
-	    sys_nosys },			/* 373 = unimplemented sys_dipc */
+	    linux_sys_nosys },			/* 373 = unimplemented sys_dipc */
 	{ 0, 0,
-	    sys_nosys },			/* 374 = unimplemented shmget */
+	    linux_sys_nosys },			/* 374 = unimplemented shmget */
 	{ 0, 0,
-	    sys_nosys },			/* 375 = filler */
+	    linux_sys_nosys },			/* 375 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 376 = filler */
+	    linux_sys_nosys },			/* 376 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 377 = filler */
+	    linux_sys_nosys },			/* 377 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 378 = filler */
+	    linux_sys_nosys },			/* 378 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 379 = filler */
+	    linux_sys_nosys },			/* 379 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 380 = filler */
+	    linux_sys_nosys },			/* 380 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 381 = filler */
+	    linux_sys_nosys },			/* 381 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 382 = filler */
+	    linux_sys_nosys },			/* 382 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 383 = filler */
+	    linux_sys_nosys },			/* 383 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 384 = filler */
+	    linux_sys_nosys },			/* 384 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 385 = filler */
+	    linux_sys_nosys },			/* 385 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 386 = filler */
+	    linux_sys_nosys },			/* 386 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 387 = filler */
+	    linux_sys_nosys },			/* 387 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 388 = filler */
+	    linux_sys_nosys },			/* 388 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 389 = filler */
+	    linux_sys_nosys },			/* 389 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 390 = filler */
+	    linux_sys_nosys },			/* 390 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 391 = filler */
+	    linux_sys_nosys },			/* 391 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 392 = filler */
+	    linux_sys_nosys },			/* 392 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 393 = filler */
+	    linux_sys_nosys },			/* 393 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 394 = filler */
+	    linux_sys_nosys },			/* 394 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 395 = filler */
+	    linux_sys_nosys },			/* 395 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 396 = filler */
+	    linux_sys_nosys },			/* 396 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 397 = filler */
+	    linux_sys_nosys },			/* 397 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 398 = filler */
+	    linux_sys_nosys },			/* 398 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 399 = filler */
+	    linux_sys_nosys },			/* 399 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 400 = filler */
+	    linux_sys_nosys },			/* 400 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 401 = filler */
+	    linux_sys_nosys },			/* 401 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 402 = filler */
+	    linux_sys_nosys },			/* 402 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 403 = filler */
+	    linux_sys_nosys },			/* 403 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 404 = filler */
+	    linux_sys_nosys },			/* 404 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 405 = filler */
+	    linux_sys_nosys },			/* 405 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 406 = filler */
+	    linux_sys_nosys },			/* 406 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 407 = filler */
+	    linux_sys_nosys },			/* 407 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 408 = filler */
+	    linux_sys_nosys },			/* 408 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 409 = filler */
+	    linux_sys_nosys },			/* 409 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 410 = filler */
+	    linux_sys_nosys },			/* 410 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 411 = filler */
+	    linux_sys_nosys },			/* 411 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 412 = filler */
+	    linux_sys_nosys },			/* 412 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 413 = filler */
+	    linux_sys_nosys },			/* 413 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 414 = filler */
+	    linux_sys_nosys },			/* 414 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 415 = filler */
+	    linux_sys_nosys },			/* 415 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 416 = filler */
+	    linux_sys_nosys },			/* 416 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 417 = filler */
+	    linux_sys_nosys },			/* 417 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 418 = filler */
+	    linux_sys_nosys },			/* 418 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 419 = filler */
+	    linux_sys_nosys },			/* 419 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 420 = filler */
+	    linux_sys_nosys },			/* 420 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 421 = filler */
+	    linux_sys_nosys },			/* 421 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 422 = filler */
+	    linux_sys_nosys },			/* 422 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 423 = filler */
+	    linux_sys_nosys },			/* 423 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 424 = filler */
+	    linux_sys_nosys },			/* 424 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 425 = filler */
+	    linux_sys_nosys },			/* 425 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 426 = filler */
+	    linux_sys_nosys },			/* 426 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 427 = filler */
+	    linux_sys_nosys },			/* 427 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 428 = filler */
+	    linux_sys_nosys },			/* 428 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 429 = filler */
+	    linux_sys_nosys },			/* 429 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 430 = filler */
+	    linux_sys_nosys },			/* 430 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 431 = filler */
+	    linux_sys_nosys },			/* 431 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 432 = filler */
+	    linux_sys_nosys },			/* 432 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 433 = filler */
+	    linux_sys_nosys },			/* 433 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 434 = filler */
+	    linux_sys_nosys },			/* 434 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 435 = filler */
+	    linux_sys_nosys },			/* 435 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 436 = filler */
+	    linux_sys_nosys },			/* 436 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 437 = filler */
+	    linux_sys_nosys },			/* 437 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 438 = filler */
+	    linux_sys_nosys },			/* 438 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 439 = filler */
+	    linux_sys_nosys },			/* 439 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 440 = filler */
+	    linux_sys_nosys },			/* 440 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 441 = filler */
+	    linux_sys_nosys },			/* 441 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 442 = filler */
+	    linux_sys_nosys },			/* 442 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 443 = filler */
+	    linux_sys_nosys },			/* 443 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 444 = filler */
+	    linux_sys_nosys },			/* 444 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 445 = filler */
+	    linux_sys_nosys },			/* 445 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 446 = filler */
+	    linux_sys_nosys },			/* 446 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 447 = filler */
+	    linux_sys_nosys },			/* 447 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 448 = filler */
+	    linux_sys_nosys },			/* 448 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 449 = filler */
+	    linux_sys_nosys },			/* 449 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 450 = filler */
+	    linux_sys_nosys },			/* 450 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 451 = filler */
+	    linux_sys_nosys },			/* 451 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 452 = filler */
+	    linux_sys_nosys },			/* 452 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 453 = filler */
+	    linux_sys_nosys },			/* 453 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 454 = filler */
+	    linux_sys_nosys },			/* 454 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 455 = filler */
+	    linux_sys_nosys },			/* 455 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 456 = filler */
+	    linux_sys_nosys },			/* 456 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 457 = filler */
+	    linux_sys_nosys },			/* 457 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 458 = filler */
+	    linux_sys_nosys },			/* 458 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 459 = filler */
+	    linux_sys_nosys },			/* 459 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 460 = filler */
+	    linux_sys_nosys },			/* 460 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 461 = filler */
+	    linux_sys_nosys },			/* 461 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 462 = filler */
+	    linux_sys_nosys },			/* 462 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 463 = filler */
+	    linux_sys_nosys },			/* 463 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 464 = filler */
+	    linux_sys_nosys },			/* 464 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 465 = filler */
+	    linux_sys_nosys },			/* 465 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 466 = filler */
+	    linux_sys_nosys },			/* 466 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 467 = filler */
+	    linux_sys_nosys },			/* 467 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 468 = filler */
+	    linux_sys_nosys },			/* 468 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 469 = filler */
+	    linux_sys_nosys },			/* 469 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 470 = filler */
+	    linux_sys_nosys },			/* 470 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 471 = filler */
+	    linux_sys_nosys },			/* 471 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 472 = filler */
+	    linux_sys_nosys },			/* 472 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 473 = filler */
+	    linux_sys_nosys },			/* 473 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 474 = filler */
+	    linux_sys_nosys },			/* 474 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 475 = filler */
+	    linux_sys_nosys },			/* 475 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 476 = filler */
+	    linux_sys_nosys },			/* 476 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 477 = filler */
+	    linux_sys_nosys },			/* 477 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 478 = filler */
+	    linux_sys_nosys },			/* 478 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 479 = filler */
+	    linux_sys_nosys },			/* 479 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 480 = filler */
+	    linux_sys_nosys },			/* 480 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 481 = filler */
+	    linux_sys_nosys },			/* 481 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 482 = filler */
+	    linux_sys_nosys },			/* 482 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 483 = filler */
+	    linux_sys_nosys },			/* 483 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 484 = filler */
+	    linux_sys_nosys },			/* 484 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 485 = filler */
+	    linux_sys_nosys },			/* 485 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 486 = filler */
+	    linux_sys_nosys },			/* 486 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 487 = filler */
+	    linux_sys_nosys },			/* 487 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 488 = filler */
+	    linux_sys_nosys },			/* 488 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 489 = filler */
+	    linux_sys_nosys },			/* 489 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 490 = filler */
+	    linux_sys_nosys },			/* 490 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 491 = filler */
+	    linux_sys_nosys },			/* 491 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 492 = filler */
+	    linux_sys_nosys },			/* 492 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 493 = filler */
+	    linux_sys_nosys },			/* 493 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 494 = filler */
+	    linux_sys_nosys },			/* 494 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 495 = filler */
+	    linux_sys_nosys },			/* 495 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 496 = filler */
+	    linux_sys_nosys },			/* 496 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 497 = filler */
+	    linux_sys_nosys },			/* 497 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 498 = filler */
+	    linux_sys_nosys },			/* 498 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 499 = filler */
+	    linux_sys_nosys },			/* 499 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 500 = filler */
+	    linux_sys_nosys },			/* 500 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 501 = filler */
+	    linux_sys_nosys },			/* 501 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 502 = filler */
+	    linux_sys_nosys },			/* 502 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 503 = filler */
+	    linux_sys_nosys },			/* 503 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 504 = filler */
+	    linux_sys_nosys },			/* 504 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 505 = filler */
+	    linux_sys_nosys },			/* 505 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 506 = filler */
+	    linux_sys_nosys },			/* 506 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 507 = filler */
+	    linux_sys_nosys },			/* 507 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 508 = filler */
+	    linux_sys_nosys },			/* 508 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 509 = filler */
+	    linux_sys_nosys },			/* 509 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 510 = filler */
+	    linux_sys_nosys },			/* 510 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 511 = filler */
+	    linux_sys_nosys },			/* 511 = filler */
 };
 
Index: compat/linux/arch/alpha/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/alpha/syscalls.conf,v
retrieving revision 1.2
diff -u -w -r1.2 syscalls.conf
--- compat/linux/arch/alpha/syscalls.conf	2000/12/14 18:07:54	1.2
+++ compat/linux/arch/alpha/syscalls.conf	2000/12/28 00:09:01
@@ -11,3 +11,4 @@
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
 nsysent=512
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/alpha/syscalls.master
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/alpha/syscalls.master,v
retrieving revision 1.30
diff -u -w -r1.30 syscalls.master
--- compat/linux/arch/alpha/syscalls.master	2000/12/21 20:42:15	1.30
+++ compat/linux/arch/alpha/syscalls.master	2000/12/28 00:09:01
@@ -84,7 +84,7 @@
 
 %%
 
-0	NOARGS		{ int sys_nosys(void); } syscall
+0	NOARGS		{ int linux_sys_nosys(void); } syscall
 1	NOARGS		{ int sys_exit(int rval); }
 2	NOARGS		{ int sys_fork(void); }
 3	NOARGS		{ int sys_read(int fd, void *buf, size_t nbyte); }
Index: compat/linux/arch/arm32/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/arm32/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/arm32/syscalls.conf	1998/09/30 21:55:57	1.1
+++ compat/linux/arch/arm32/syscalls.conf	2000/12/28 00:09:01
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/i386/linux_syscallargs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/i386/linux_syscallargs.h,v
retrieving revision 1.31
diff -u -w -r1.31 linux_syscallargs.h
--- compat/linux/arch/i386/linux_syscallargs.h	2000/12/27 22:03:10	1.31
+++ compat/linux/arch/i386/linux_syscallargs.h	2000/12/28 00:09:02
@@ -565,7 +565,7 @@
  * System call prototypes.
  */
 
-int	sys_nosys(struct proc *, void *, register_t *);
+int	linux_sys_nosys(struct proc *, void *, register_t *);
 int	sys_exit(struct proc *, void *, register_t *);
 int	sys_fork(struct proc *, void *, register_t *);
 int	sys_read(struct proc *, void *, register_t *);
Index: compat/linux/arch/i386/linux_sysent.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/i386/linux_sysent.c,v
retrieving revision 1.31
diff -u -w -r1.31 linux_sysent.c
--- compat/linux/arch/i386/linux_sysent.c	2000/12/27 22:03:10	1.31
+++ compat/linux/arch/i386/linux_sysent.c	2000/12/28 00:09:03
@@ -26,7 +26,7 @@
 
 struct sysent linux_sysent[] = {
 	{ 0, 0,
-	    sys_nosys },			/* 0 = syscall */
+	    linux_sys_nosys },			/* 0 = syscall */
 	{ 1, s(struct sys_exit_args),
 	    sys_exit },				/* 1 = exit */
 	{ 0, 0,
@@ -62,15 +62,15 @@
 	{ 1, s(struct linux_sys_break_args),
 	    linux_sys_break },			/* 17 = break */
 	{ 0, 0,
-	    sys_nosys },			/* 18 = obsolete ostat */
+	    linux_sys_nosys },			/* 18 = obsolete ostat */
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43_sys_lseek },		/* 19 = lseek */
 	{ 0, 0,
 	    sys_getpid },			/* 20 = getpid */
 	{ 0, 0,
-	    sys_nosys },			/* 21 = unimplemented mount */
+	    linux_sys_nosys },			/* 21 = unimplemented mount */
 	{ 0, 0,
-	    sys_nosys },			/* 22 = unimplemented umount */
+	    linux_sys_nosys },			/* 22 = unimplemented umount */
 	{ 1, s(struct sys_setuid_args),
 	    sys_setuid },			/* 23 = linux_setuid16 */
 	{ 0, 0,
@@ -82,21 +82,21 @@
 	{ 1, s(struct linux_sys_alarm_args),
 	    linux_sys_alarm },			/* 27 = alarm */
 	{ 0, 0,
-	    sys_nosys },			/* 28 = obsolete ofstat */
+	    linux_sys_nosys },			/* 28 = obsolete ofstat */
 	{ 0, 0,
 	    linux_sys_pause },			/* 29 = pause */
 	{ 2, s(struct linux_sys_utime_args),
 	    linux_sys_utime },			/* 30 = utime */
 	{ 0, 0,
-	    sys_nosys },			/* 31 = obsolete stty */
+	    linux_sys_nosys },			/* 31 = obsolete stty */
 	{ 0, 0,
-	    sys_nosys },			/* 32 = obsolete gtty */
+	    linux_sys_nosys },			/* 32 = obsolete gtty */
 	{ 2, s(struct linux_sys_access_args),
 	    linux_sys_access },			/* 33 = access */
 	{ 1, s(struct linux_sys_nice_args),
 	    linux_sys_nice },			/* 34 = nice */
 	{ 0, 0,
-	    sys_nosys },			/* 35 = obsolete ftime */
+	    linux_sys_nosys },			/* 35 = obsolete ftime */
 	{ 0, 0,
 	    sys_sync },				/* 36 = sync */
 	{ 2, s(struct linux_sys_kill_args),
@@ -114,7 +114,7 @@
 	{ 1, s(struct linux_sys_times_args),
 	    linux_sys_times },			/* 43 = times */
 	{ 0, 0,
-	    sys_nosys },			/* 44 = obsolete prof */
+	    linux_sys_nosys },			/* 44 = obsolete prof */
 	{ 1, s(struct linux_sys_brk_args),
 	    linux_sys_brk },			/* 45 = brk */
 	{ 1, s(struct sys_setgid_args),
@@ -130,19 +130,19 @@
 	{ 1, s(struct sys_acct_args),
 	    sys_acct },				/* 51 = acct */
 	{ 0, 0,
-	    sys_nosys },			/* 52 = obsolete phys */
+	    linux_sys_nosys },			/* 52 = obsolete phys */
 	{ 0, 0,
-	    sys_nosys },			/* 53 = obsolete lock */
+	    linux_sys_nosys },			/* 53 = obsolete lock */
 	{ 3, s(struct linux_sys_ioctl_args),
 	    linux_sys_ioctl },			/* 54 = ioctl */
 	{ 3, s(struct linux_sys_fcntl_args),
 	    linux_sys_fcntl },			/* 55 = fcntl */
 	{ 0, 0,
-	    sys_nosys },			/* 56 = obsolete mpx */
+	    linux_sys_nosys },			/* 56 = obsolete mpx */
 	{ 2, s(struct sys_setpgid_args),
 	    sys_setpgid },			/* 57 = setpgid */
 	{ 0, 0,
-	    sys_nosys },			/* 58 = obsolete ulimit */
+	    linux_sys_nosys },			/* 58 = obsolete ulimit */
 	{ 1, s(struct linux_sys_oldolduname_args),
 	    linux_sys_oldolduname },		/* 59 = oldolduname */
 	{ 1, s(struct sys_umask_args),
@@ -150,7 +150,7 @@
 	{ 1, s(struct sys_chroot_args),
 	    sys_chroot },			/* 61 = chroot */
 	{ 0, 0,
-	    sys_nosys },			/* 62 = unimplemented ustat */
+	    linux_sys_nosys },			/* 62 = unimplemented ustat */
 	{ 2, s(struct sys_dup2_args),
 	    sys_dup2 },				/* 63 = dup2 */
 	{ 0, 0,
@@ -232,7 +232,7 @@
 	{ 2, s(struct linux_sys_socketcall_args),
 	    linux_sys_socketcall },		/* 102 = socketcall */
 	{ 0, 0,
-	    sys_nosys },			/* 103 = unimplemented syslog */
+	    linux_sys_nosys },			/* 103 = unimplemented syslog */
 	{ 3, s(struct sys_setitimer_args),
 	    sys_setitimer },			/* 104 = setitimer */
 	{ 2, s(struct sys_getitimer_args),
@@ -248,11 +248,11 @@
 	{ 1, s(struct linux_sys_iopl_args),
 	    linux_sys_iopl },			/* 110 = iopl */
 	{ 0, 0,
-	    sys_nosys },			/* 111 = unimplemented vhangup */
+	    linux_sys_nosys },			/* 111 = unimplemented vhangup */
 	{ 0, 0,
-	    sys_nosys },			/* 112 = unimplemented idle */
+	    linux_sys_nosys },			/* 112 = unimplemented idle */
 	{ 0, 0,
-	    sys_nosys },			/* 113 = unimplemented vm86old */
+	    linux_sys_nosys },			/* 113 = unimplemented vm86old */
 	{ 4, s(struct linux_sys_wait4_args),
 	    linux_sys_wait4 },			/* 114 = wait4 */
 	{ 1, s(struct linux_sys_swapoff_args),
@@ -274,33 +274,33 @@
 	{ 3, s(struct linux_sys_modify_ldt_args),
 	    linux_sys_modify_ldt },		/* 123 = modify_ldt */
 	{ 0, 0,
-	    sys_nosys },			/* 124 = unimplemented adjtimex */
+	    linux_sys_nosys },			/* 124 = unimplemented adjtimex */
 	{ 3, s(struct sys_mprotect_args),
 	    sys_mprotect },			/* 125 = mprotect */
 	{ 3, s(struct linux_sys_sigprocmask_args),
 	    linux_sys_sigprocmask },		/* 126 = sigprocmask */
 	{ 0, 0,
-	    sys_nosys },			/* 127 = unimplemented create_module */
+	    linux_sys_nosys },			/* 127 = unimplemented create_module */
 	{ 0, 0,
-	    sys_nosys },			/* 128 = unimplemented init_module */
+	    linux_sys_nosys },			/* 128 = unimplemented init_module */
 	{ 0, 0,
-	    sys_nosys },			/* 129 = unimplemented delete_module */
+	    linux_sys_nosys },			/* 129 = unimplemented delete_module */
 	{ 0, 0,
-	    sys_nosys },			/* 130 = unimplemented get_kernel_syms */
+	    linux_sys_nosys },			/* 130 = unimplemented get_kernel_syms */
 	{ 0, 0,
-	    sys_nosys },			/* 131 = unimplemented quotactl */
+	    linux_sys_nosys },			/* 131 = unimplemented quotactl */
 	{ 1, s(struct linux_sys_getpgid_args),
 	    linux_sys_getpgid },		/* 132 = getpgid */
 	{ 1, s(struct sys_fchdir_args),
 	    sys_fchdir },			/* 133 = fchdir */
 	{ 0, 0,
-	    sys_nosys },			/* 134 = unimplemented bdflush */
+	    linux_sys_nosys },			/* 134 = unimplemented bdflush */
 	{ 0, 0,
-	    sys_nosys },			/* 135 = unimplemented sysfs */
+	    linux_sys_nosys },			/* 135 = unimplemented sysfs */
 	{ 1, s(struct linux_sys_personality_args),
 	    linux_sys_personality },		/* 136 = personality */
 	{ 0, 0,
-	    sys_nosys },			/* 137 = unimplemented afs_syscall */
+	    linux_sys_nosys },			/* 137 = unimplemented afs_syscall */
 	{ 1, s(struct linux_sys_setfsuid_args),
 	    linux_sys_setfsuid },		/* 138 = linux_setfsuid16 */
 	{ 0, 0,
@@ -348,7 +348,7 @@
 	{ 1, s(struct linux_sys_sched_get_priority_min_args),
 	    linux_sys_sched_get_priority_min },	/* 160 = sched_get_priority_min */
 	{ 0, 0,
-	    sys_nosys },			/* 161 = unimplemented sys_sched_rr_get_interval */
+	    linux_sys_nosys },			/* 161 = unimplemented sys_sched_rr_get_interval */
 	{ 2, s(struct sys_nanosleep_args),
 	    sys_nanosleep },			/* 162 = nanosleep */
 	{ 4, s(struct linux_sys_mremap_args),
@@ -358,19 +358,19 @@
 	{ 3, s(struct linux_sys_getresuid_args),
 	    linux_sys_getresuid },		/* 165 = linux_getresuid16 */
 	{ 0, 0,
-	    sys_nosys },			/* 166 = unimplemented vm86 */
+	    linux_sys_nosys },			/* 166 = unimplemented vm86 */
 	{ 0, 0,
-	    sys_nosys },			/* 167 = unimplemented query_module */
+	    linux_sys_nosys },			/* 167 = unimplemented query_module */
 	{ 3, s(struct sys_poll_args),
 	    sys_poll },				/* 168 = poll */
 	{ 0, 0,
-	    sys_nosys },			/* 169 = unimplemented nfsservctl */
+	    linux_sys_nosys },			/* 169 = unimplemented nfsservctl */
 	{ 3, s(struct linux_sys_setresgid16_args),
 	    linux_sys_setresgid16 },		/* 170 = setresgid16 */
 	{ 3, s(struct linux_sys_getresgid_args),
 	    linux_sys_getresgid },		/* 171 = linux_getresgid16 */
 	{ 0, 0,
-	    sys_nosys },			/* 172 = unimplemented prctl */
+	    linux_sys_nosys },			/* 172 = unimplemented prctl */
 	{ 1, s(struct linux_sys_rt_sigreturn_args),
 	    linux_sys_rt_sigreturn },		/* 173 = rt_sigreturn */
 	{ 4, s(struct linux_sys_rt_sigaction_args),
@@ -380,7 +380,7 @@
 	{ 2, s(struct linux_sys_rt_sigpending_args),
 	    linux_sys_rt_sigpending },		/* 176 = rt_sigpending */
 	{ 0, 0,
-	    sys_nosys },			/* 177 = unimplemented rt_sigtimedwait */
+	    linux_sys_nosys },			/* 177 = unimplemented rt_sigtimedwait */
 	{ 3, s(struct linux_sys_rt_queueinfo_args),
 	    linux_sys_rt_queueinfo },		/* 178 = rt_queueinfo */
 	{ 2, s(struct linux_sys_rt_sigsuspend_args),
@@ -394,23 +394,23 @@
 	{ 2, s(struct sys___getcwd_args),
 	    sys___getcwd },			/* 183 = __getcwd */
 	{ 0, 0,
-	    sys_nosys },			/* 184 = unimplemented capget */
+	    linux_sys_nosys },			/* 184 = unimplemented capget */
 	{ 0, 0,
-	    sys_nosys },			/* 185 = unimplemented capset */
+	    linux_sys_nosys },			/* 185 = unimplemented capset */
 	{ 2, s(struct linux_sys_sigaltstack_args),
 	    linux_sys_sigaltstack },		/* 186 = sigaltstack */
 	{ 0, 0,
-	    sys_nosys },			/* 187 = unimplemented sendfile */
+	    linux_sys_nosys },			/* 187 = unimplemented sendfile */
 	{ 0, 0,
-	    sys_nosys },			/* 188 = unimplemented getpmsg */
+	    linux_sys_nosys },			/* 188 = unimplemented getpmsg */
 	{ 0, 0,
-	    sys_nosys },			/* 189 = unimplemented putpmsg */
+	    linux_sys_nosys },			/* 189 = unimplemented putpmsg */
 	{ 0, 0,
 	    sys___vfork14 },			/* 190 = __vfork14 */
 	{ 0, 0,
-	    sys_nosys },			/* 191 = unimplemented getrlimit */
+	    linux_sys_nosys },			/* 191 = unimplemented getrlimit */
 	{ 0, 0,
-	    sys_nosys },			/* 192 = unimplemented mmap2 */
+	    linux_sys_nosys },			/* 192 = unimplemented mmap2 */
 	{ 2, s(struct linux_sys_truncate64_args),
 	    linux_sys_truncate64 },		/* 193 = truncate64 */
 	{ 2, s(struct sys_ftruncate_args),
@@ -460,82 +460,82 @@
 	{ 0, 0,
 	    linux_sys_getfsuid },		/* 216 = getfsuid */
 	{ 0, 0,
-	    sys_nosys },			/* 217 = unimplemented pivot_root */
+	    linux_sys_nosys },			/* 217 = unimplemented pivot_root */
 	{ 0, 0,
-	    sys_nosys },			/* 218 = filler */
+	    linux_sys_nosys },			/* 218 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 219 = filler */
+	    linux_sys_nosys },			/* 219 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 220 = filler */
+	    linux_sys_nosys },			/* 220 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 221 = filler */
+	    linux_sys_nosys },			/* 221 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 222 = filler */
+	    linux_sys_nosys },			/* 222 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 223 = filler */
+	    linux_sys_nosys },			/* 223 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 224 = filler */
+	    linux_sys_nosys },			/* 224 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 225 = filler */
+	    linux_sys_nosys },			/* 225 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 226 = filler */
+	    linux_sys_nosys },			/* 226 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 227 = filler */
+	    linux_sys_nosys },			/* 227 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 228 = filler */
+	    linux_sys_nosys },			/* 228 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 229 = filler */
+	    linux_sys_nosys },			/* 229 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 230 = filler */
+	    linux_sys_nosys },			/* 230 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 231 = filler */
+	    linux_sys_nosys },			/* 231 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 232 = filler */
+	    linux_sys_nosys },			/* 232 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 233 = filler */
+	    linux_sys_nosys },			/* 233 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 234 = filler */
+	    linux_sys_nosys },			/* 234 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 235 = filler */
+	    linux_sys_nosys },			/* 235 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 236 = filler */
+	    linux_sys_nosys },			/* 236 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 237 = filler */
+	    linux_sys_nosys },			/* 237 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 238 = filler */
+	    linux_sys_nosys },			/* 238 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 239 = filler */
+	    linux_sys_nosys },			/* 239 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 240 = filler */
+	    linux_sys_nosys },			/* 240 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 241 = filler */
+	    linux_sys_nosys },			/* 241 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 242 = filler */
+	    linux_sys_nosys },			/* 242 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 243 = filler */
+	    linux_sys_nosys },			/* 243 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 244 = filler */
+	    linux_sys_nosys },			/* 244 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 245 = filler */
+	    linux_sys_nosys },			/* 245 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 246 = filler */
+	    linux_sys_nosys },			/* 246 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 247 = filler */
+	    linux_sys_nosys },			/* 247 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 248 = filler */
+	    linux_sys_nosys },			/* 248 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 249 = filler */
+	    linux_sys_nosys },			/* 249 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 250 = filler */
+	    linux_sys_nosys },			/* 250 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 251 = filler */
+	    linux_sys_nosys },			/* 251 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 252 = filler */
+	    linux_sys_nosys },			/* 252 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 253 = filler */
+	    linux_sys_nosys },			/* 253 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 254 = filler */
+	    linux_sys_nosys },			/* 254 = filler */
 	{ 0, 0,
-	    sys_nosys },			/* 255 = filler */
+	    linux_sys_nosys },			/* 255 = filler */
 };
 
Index: compat/linux/arch/i386/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/i386/syscalls.conf,v
retrieving revision 1.3
diff -u -w -r1.3 syscalls.conf
--- compat/linux/arch/i386/syscalls.conf	2000/12/11 03:09:02	1.3
+++ compat/linux/arch/i386/syscalls.conf	2000/12/28 00:09:03
@@ -11,3 +11,4 @@
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
 nsysent=256
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/i386/syscalls.master
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/i386/syscalls.master,v
retrieving revision 1.52
diff -u -w -r1.52 syscalls.master
--- compat/linux/arch/i386/syscalls.master	2000/12/27 22:02:41	1.52
+++ compat/linux/arch/i386/syscalls.master	2000/12/28 00:09:03
@@ -53,7 +53,7 @@
 
 %%
 
-0	NOARGS		{ int sys_nosys(void); } syscall
+0	NOARGS		{ int linux_sys_nosys(void); } syscall
 1	NOARGS		{ int sys_exit(int rval); }
 2	NOARGS		{ int sys_fork(void); }
 3	NOARGS		{ int sys_read(int fd, char *buf, u_int nbyte); }
Index: compat/linux/arch/m68k/linux_syscallargs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/m68k/linux_syscallargs.h,v
retrieving revision 1.28
diff -u -w -r1.28 linux_syscallargs.h
--- compat/linux/arch/m68k/linux_syscallargs.h	2000/12/27 22:04:36	1.28
+++ compat/linux/arch/m68k/linux_syscallargs.h	2000/12/28 00:09:04
@@ -536,7 +536,7 @@
  * System call prototypes.
  */
 
-int	sys_nosys(struct proc *, void *, register_t *);
+int	linux_sys_nosys(struct proc *, void *, register_t *);
 int	sys_exit(struct proc *, void *, register_t *);
 int	sys_fork(struct proc *, void *, register_t *);
 int	sys_read(struct proc *, void *, register_t *);
Index: compat/linux/arch/m68k/linux_sysent.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/m68k/linux_sysent.c,v
retrieving revision 1.28
diff -u -w -r1.28 linux_sysent.c
--- compat/linux/arch/m68k/linux_sysent.c	2000/12/27 22:04:36	1.28
+++ compat/linux/arch/m68k/linux_sysent.c	2000/12/28 00:09:04
@@ -27,7 +27,7 @@
 
 struct sysent linux_sysent[] = {
 	{ 0, 0,
-	    sys_nosys },			/* 0 = syscall */
+	    linux_sys_nosys },			/* 0 = syscall */
 	{ 1, s(struct sys_exit_args),
 	    sys_exit },				/* 1 = exit */
 	{ 0, 0,
@@ -61,22 +61,22 @@
 	{ 3, s(struct linux_sys_chown16_args),
 	    linux_sys_chown16 },		/* 16 = chown16 */
 	{ 0, 0,
-	    sys_nosys },			/* 17 = obsolete break */
+	    linux_sys_nosys },			/* 17 = obsolete break */
 	{ 0, 0,
-	    sys_nosys },			/* 18 = obsolete ostat */
+	    linux_sys_nosys },			/* 18 = obsolete ostat */
 #if !defined(_KERNEL) || defined(COMPAT_43)
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43_sys_lseek },		/* 19 = lseek */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 19 = unimplemented compat_43_sys_lseek */
+	    linux_sys_nosys },			/* 19 = unimplemented compat_43_sys_lseek */
 #endif
 	{ 0, 0,
 	    sys_getpid },			/* 20 = getpid */
 	{ 0, 0,
-	    sys_nosys },			/* 21 = unimplemented mount */
+	    linux_sys_nosys },			/* 21 = unimplemented mount */
 	{ 0, 0,
-	    sys_nosys },			/* 22 = obsolete umount */
+	    linux_sys_nosys },			/* 22 = obsolete umount */
 	{ 1, s(struct sys_setuid_args),
 	    sys_setuid },			/* 23 = linux_setuid16 */
 	{ 0, 0,
@@ -88,21 +88,21 @@
 	{ 1, s(struct linux_sys_alarm_args),
 	    linux_sys_alarm },			/* 27 = alarm */
 	{ 0, 0,
-	    sys_nosys },			/* 28 = obsolete ofstat */
+	    linux_sys_nosys },			/* 28 = obsolete ofstat */
 	{ 0, 0,
 	    linux_sys_pause },			/* 29 = pause */
 	{ 2, s(struct linux_sys_utime_args),
 	    linux_sys_utime },			/* 30 = utime */
 	{ 0, 0,
-	    sys_nosys },			/* 31 = obsolete stty */
+	    linux_sys_nosys },			/* 31 = obsolete stty */
 	{ 0, 0,
-	    sys_nosys },			/* 32 = obsolete gtty */
+	    linux_sys_nosys },			/* 32 = obsolete gtty */
 	{ 2, s(struct linux_sys_access_args),
 	    linux_sys_access },			/* 33 = access */
 	{ 1, s(struct linux_sys_nice_args),
 	    linux_sys_nice },			/* 34 = nice */
 	{ 0, 0,
-	    sys_nosys },			/* 35 = obsolete ftime */
+	    linux_sys_nosys },			/* 35 = obsolete ftime */
 	{ 0, 0,
 	    sys_sync },				/* 36 = sync */
 	{ 2, s(struct linux_sys_kill_args),
@@ -120,7 +120,7 @@
 	{ 1, s(struct linux_sys_times_args),
 	    linux_sys_times },			/* 43 = times */
 	{ 0, 0,
-	    sys_nosys },			/* 44 = obsolete prof */
+	    linux_sys_nosys },			/* 44 = obsolete prof */
 	{ 1, s(struct linux_sys_brk_args),
 	    linux_sys_brk },			/* 45 = brk */
 	{ 1, s(struct sys_setgid_args),
@@ -136,27 +136,27 @@
 	{ 1, s(struct sys_acct_args),
 	    sys_acct },				/* 51 = acct */
 	{ 0, 0,
-	    sys_nosys },			/* 52 = unimplemented umount */
+	    linux_sys_nosys },			/* 52 = unimplemented umount */
 	{ 0, 0,
-	    sys_nosys },			/* 53 = obsolete lock */
+	    linux_sys_nosys },			/* 53 = obsolete lock */
 	{ 3, s(struct linux_sys_ioctl_args),
 	    linux_sys_ioctl },			/* 54 = ioctl */
 	{ 3, s(struct linux_sys_fcntl_args),
 	    linux_sys_fcntl },			/* 55 = fcntl */
 	{ 0, 0,
-	    sys_nosys },			/* 56 = obsolete mpx */
+	    linux_sys_nosys },			/* 56 = obsolete mpx */
 	{ 2, s(struct sys_setpgid_args),
 	    sys_setpgid },			/* 57 = setpgid */
 	{ 0, 0,
-	    sys_nosys },			/* 58 = obsolete ulimit */
+	    linux_sys_nosys },			/* 58 = obsolete ulimit */
 	{ 0, 0,
-	    sys_nosys },			/* 59 = unimplemented oldolduname */
+	    linux_sys_nosys },			/* 59 = unimplemented oldolduname */
 	{ 1, s(struct sys_umask_args),
 	    sys_umask },			/* 60 = umask */
 	{ 1, s(struct sys_chroot_args),
 	    sys_chroot },			/* 61 = chroot */
 	{ 0, 0,
-	    sys_nosys },			/* 62 = unimplemented ustat */
+	    linux_sys_nosys },			/* 62 = unimplemented ustat */
 	{ 2, s(struct sys_dup2_args),
 	    sys_dup2 },				/* 63 = dup2 */
 	{ 0, 0,
@@ -188,11 +188,11 @@
 	    compat_43_sys_getrlimit },		/* 76 = getrlimit */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 74 = unimplemented compat_43_sys_sethostname */
+	    linux_sys_nosys },			/* 74 = unimplemented compat_43_sys_sethostname */
 	{ 0, 0,
-	    sys_nosys },			/* 75 = unimplemented compat_43_sys_setrlimit */
+	    linux_sys_nosys },			/* 75 = unimplemented compat_43_sys_setrlimit */
 	{ 0, 0,
-	    sys_nosys },			/* 76 = unimplemented compat_43_sys_getrlimit */
+	    linux_sys_nosys },			/* 76 = unimplemented compat_43_sys_getrlimit */
 #endif
 	{ 2, s(struct sys_getrusage_args),
 	    sys_getrusage },			/* 77 = getrusage */
@@ -213,7 +213,7 @@
 	    compat_43_sys_lstat },		/* 84 = oolstat */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 84 = unimplemented compat_43_sys_lstat */
+	    linux_sys_nosys },			/* 84 = unimplemented compat_43_sys_lstat */
 #endif
 	{ 3, s(struct linux_sys_readlink_args),
 	    linux_sys_readlink },		/* 85 = readlink */
@@ -236,7 +236,7 @@
 	    compat_43_sys_ftruncate },		/* 93 = ftruncate */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 93 = unimplemented compat_43_sys_ftruncate */
+	    linux_sys_nosys },			/* 93 = unimplemented compat_43_sys_ftruncate */
 #endif
 	{ 2, s(struct sys_fchmod_args),
 	    sys_fchmod },			/* 94 = fchmod */
@@ -253,11 +253,11 @@
 	{ 2, s(struct linux_sys_fstatfs_args),
 	    linux_sys_fstatfs },		/* 100 = fstatfs */
 	{ 0, 0,
-	    sys_nosys },			/* 101 = unimplemented ioperm */
+	    linux_sys_nosys },			/* 101 = unimplemented ioperm */
 	{ 2, s(struct linux_sys_socketcall_args),
 	    linux_sys_socketcall },		/* 102 = socketcall */
 	{ 0, 0,
-	    sys_nosys },			/* 103 = unimplemented syslog */
+	    linux_sys_nosys },			/* 103 = unimplemented syslog */
 	{ 3, s(struct sys_setitimer_args),
 	    sys_setitimer },			/* 104 = setitimer */
 	{ 2, s(struct sys_getitimer_args),
@@ -269,15 +269,15 @@
 	{ 2, s(struct linux_sys_fstat_args),
 	    linux_sys_fstat },			/* 108 = fstat */
 	{ 0, 0,
-	    sys_nosys },			/* 109 = unimplemented olduname */
+	    linux_sys_nosys },			/* 109 = unimplemented olduname */
 	{ 0, 0,
-	    sys_nosys },			/* 110 = unimplemented iopl */
+	    linux_sys_nosys },			/* 110 = unimplemented iopl */
 	{ 0, 0,
-	    sys_nosys },			/* 111 = unimplemented vhangup */
+	    linux_sys_nosys },			/* 111 = unimplemented vhangup */
 	{ 0, 0,
-	    sys_nosys },			/* 112 = unimplemented idle */
+	    linux_sys_nosys },			/* 112 = unimplemented idle */
 	{ 0, 0,
-	    sys_nosys },			/* 113 = unimplemented vm86old */
+	    linux_sys_nosys },			/* 113 = unimplemented vm86old */
 	{ 4, s(struct linux_sys_wait4_args),
 	    linux_sys_wait4 },			/* 114 = wait4 */
 	{ 1, s(struct linux_sys_swapoff_args),
@@ -299,33 +299,33 @@
 	{ 4, s(struct linux_sys_cacheflush_args),
 	    linux_sys_cacheflush },		/* 123 = cacheflush */
 	{ 0, 0,
-	    sys_nosys },			/* 124 = unimplemented adjtimex */
+	    linux_sys_nosys },			/* 124 = unimplemented adjtimex */
 	{ 3, s(struct sys_mprotect_args),
 	    sys_mprotect },			/* 125 = mprotect */
 	{ 3, s(struct linux_sys_sigprocmask_args),
 	    linux_sys_sigprocmask },		/* 126 = sigprocmask */
 	{ 0, 0,
-	    sys_nosys },			/* 127 = unimplemented create_module */
+	    linux_sys_nosys },			/* 127 = unimplemented create_module */
 	{ 0, 0,
-	    sys_nosys },			/* 128 = unimplemented init_module */
+	    linux_sys_nosys },			/* 128 = unimplemented init_module */
 	{ 0, 0,
-	    sys_nosys },			/* 129 = unimplemented delete_module */
+	    linux_sys_nosys },			/* 129 = unimplemented delete_module */
 	{ 0, 0,
-	    sys_nosys },			/* 130 = unimplemented get_kernel_syms */
+	    linux_sys_nosys },			/* 130 = unimplemented get_kernel_syms */
 	{ 0, 0,
-	    sys_nosys },			/* 131 = unimplemented quotactl */
+	    linux_sys_nosys },			/* 131 = unimplemented quotactl */
 	{ 1, s(struct linux_sys_getpgid_args),
 	    linux_sys_getpgid },		/* 132 = getpgid */
 	{ 1, s(struct sys_fchdir_args),
 	    sys_fchdir },			/* 133 = fchdir */
 	{ 0, 0,
-	    sys_nosys },			/* 134 = unimplemented bdflush */
+	    linux_sys_nosys },			/* 134 = unimplemented bdflush */
 	{ 0, 0,
-	    sys_nosys },			/* 135 = unimplemented sysfs */
+	    linux_sys_nosys },			/* 135 = unimplemented sysfs */
 	{ 1, s(struct linux_sys_personality_args),
 	    linux_sys_personality },		/* 136 = personality */
 	{ 0, 0,
-	    sys_nosys },			/* 137 = unimplemented afs_syscall */
+	    linux_sys_nosys },			/* 137 = unimplemented afs_syscall */
 	{ 1, s(struct linux_sys_setfsuid_args),
 	    linux_sys_setfsuid },		/* 138 = linux_setfsuid16 */
 	{ 0, 0,
@@ -373,7 +373,7 @@
 	{ 1, s(struct linux_sys_sched_get_priority_min_args),
 	    linux_sys_sched_get_priority_min },	/* 160 = sched_get_priority_min */
 	{ 0, 0,
-	    sys_nosys },			/* 161 = unimplemented sched_rr_get_interval */
+	    linux_sys_nosys },			/* 161 = unimplemented sched_rr_get_interval */
 	{ 2, s(struct sys_nanosleep_args),
 	    sys_nanosleep },			/* 162 = nanosleep */
 	{ 4, s(struct linux_sys_mremap_args),
@@ -383,19 +383,19 @@
 	{ 3, s(struct linux_sys_getresuid_args),
 	    linux_sys_getresuid },		/* 165 = linux_getresuid16 */
 	{ 0, 0,
-	    sys_nosys },			/* 166 = unimplemented vm86 */
+	    linux_sys_nosys },			/* 166 = unimplemented vm86 */
 	{ 0, 0,
-	    sys_nosys },			/* 167 = unimplemented query_module */
+	    linux_sys_nosys },			/* 167 = unimplemented query_module */
 	{ 3, s(struct sys_poll_args),
 	    sys_poll },				/* 168 = poll */
 	{ 0, 0,
-	    sys_nosys },			/* 169 = unimplemented nfsservctl */
+	    linux_sys_nosys },			/* 169 = unimplemented nfsservctl */
 	{ 3, s(struct linux_sys_setresgid16_args),
 	    linux_sys_setresgid16 },		/* 170 = setresgid16 */
 	{ 3, s(struct linux_sys_getresgid_args),
 	    linux_sys_getresgid },		/* 171 = linux_getresgid16 */
 	{ 0, 0,
-	    sys_nosys },			/* 172 = unimplemented prctl */
+	    linux_sys_nosys },			/* 172 = unimplemented prctl */
 	{ 0, 0,
 	    linux_sys_rt_sigreturn },		/* 173 = rt_sigreturn */
 	{ 4, s(struct linux_sys_rt_sigaction_args),
@@ -405,7 +405,7 @@
 	{ 2, s(struct linux_sys_rt_sigpending_args),
 	    linux_sys_rt_sigpending },		/* 176 = rt_sigpending */
 	{ 0, 0,
-	    sys_nosys },			/* 177 = unimplemented rt_sigtimedwait */
+	    linux_sys_nosys },			/* 177 = unimplemented rt_sigtimedwait */
 	{ 3, s(struct linux_sys_rt_queueinfo_args),
 	    linux_sys_rt_queueinfo },		/* 178 = rt_queueinfo */
 	{ 2, s(struct linux_sys_rt_sigsuspend_args),
@@ -419,23 +419,23 @@
 	{ 2, s(struct sys___getcwd_args),
 	    sys___getcwd },			/* 183 = __getcwd */
 	{ 0, 0,
-	    sys_nosys },			/* 184 = unimplemented capget */
+	    linux_sys_nosys },			/* 184 = unimplemented capget */
 	{ 0, 0,
-	    sys_nosys },			/* 185 = unimplemented capset */
+	    linux_sys_nosys },			/* 185 = unimplemented capset */
 	{ 2, s(struct linux_sys_sigaltstack_args),
 	    linux_sys_sigaltstack },		/* 186 = sigaltstack */
 	{ 0, 0,
-	    sys_nosys },			/* 187 = unimplemented sendfile */
+	    linux_sys_nosys },			/* 187 = unimplemented sendfile */
 	{ 0, 0,
-	    sys_nosys },			/* 188 = unimplemented getpmsg */
+	    linux_sys_nosys },			/* 188 = unimplemented getpmsg */
 	{ 0, 0,
-	    sys_nosys },			/* 189 = unimplemented putpmsg */
+	    linux_sys_nosys },			/* 189 = unimplemented putpmsg */
 	{ 0, 0,
 	    sys___vfork14 },			/* 190 = __vfork14 */
 	{ 0, 0,
-	    sys_nosys },			/* 191 = unimplemented getrlimit */
+	    linux_sys_nosys },			/* 191 = unimplemented getrlimit */
 	{ 0, 0,
-	    sys_nosys },			/* 192 = unimplemented mmap2 */
+	    linux_sys_nosys },			/* 192 = unimplemented mmap2 */
 	{ 2, s(struct linux_sys_truncate64_args),
 	    linux_sys_truncate64 },		/* 193 = truncate64 */
 	{ 2, s(struct sys_ftruncate_args),
@@ -485,6 +485,6 @@
 	{ 0, 0,
 	    linux_sys_getfsuid },		/* 216 = getfsuid */
 	{ 0, 0,
-	    sys_nosys },			/* 217 = unimplemented pivot_root */
+	    linux_sys_nosys },			/* 217 = unimplemented pivot_root */
 };
 
Index: compat/linux/arch/m68k/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/m68k/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/m68k/syscalls.conf	1998/09/30 21:55:58	1.1
+++ compat/linux/arch/m68k/syscalls.conf	2000/12/28 00:09:04
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/m68k/syscalls.master
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/m68k/syscalls.master,v
retrieving revision 1.27
diff -u -w -r1.27 syscalls.master
--- compat/linux/arch/m68k/syscalls.master	2000/12/27 22:04:05	1.27
+++ compat/linux/arch/m68k/syscalls.master	2000/12/28 00:09:05
@@ -54,7 +54,7 @@
 
 %%
 
-0	NOARGS		{ int sys_nosys(void); } syscall
+0	NOARGS		{ int linux_sys_nosys(void); } syscall
 1	NOARGS		{ int sys_exit(int rval); }
 2	NOARGS		{ int sys_fork(void); }
 3	NOARGS		{ int sys_read(int fd, char *buf, u_int nbyte); }
Index: compat/linux/arch/mips/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/mips/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/mips/syscalls.conf	1998/09/30 21:55:58	1.1
+++ compat/linux/arch/mips/syscalls.conf	2000/12/28 00:09:05
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/powerpc/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/powerpc/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/powerpc/syscalls.conf	1998/09/30 21:55:59	1.1
+++ compat/linux/arch/powerpc/syscalls.conf	2000/12/28 00:09:05
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/sparc/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/sparc/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/sparc/syscalls.conf	1998/09/30 21:55:59	1.1
+++ compat/linux/arch/sparc/syscalls.conf	2000/12/28 00:09:05
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/arch/sparc64/syscalls.conf
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/arch/sparc64/syscalls.conf,v
retrieving revision 1.1
diff -u -w -r1.1 syscalls.conf
--- compat/linux/arch/sparc64/syscalls.conf	1998/09/30 21:56:00	1.1
+++ compat/linux/arch/sparc64/syscalls.conf	2000/12/28 00:09:05
@@ -10,3 +10,4 @@
 switchname="linux_sysent"
 namesname="linux_syscallnames"
 constprefix="LINUX_SYS_"
+sys_nosys="linux_sys_nosys"
Index: compat/linux/common/linux_misc.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/linux/common/linux_misc.c,v
retrieving revision 1.81
diff -u -w -r1.81 linux_misc.c
--- compat/linux/common/linux_misc.c	2000/12/27 22:01:43	1.81
+++ compat/linux/common/linux_misc.c	2000/12/28 00:09:06
@@ -1418,3 +1418,16 @@
 
 	return (copyout(&si, SCARG(uap, arg), sizeof si));
 }
+
+/*
+ * nosys - not implemented syscall
+ */
+
+int
+linux_sys_nosys(p, v, retval)
+	struct proc *p;
+	void *v;
+	register_t *retval;
+{
+	return (ENOSYS);
+}
Index: kern/makesyscalls.sh
===================================================================
RCS file: /cvsroot/syssrc/sys/kern/makesyscalls.sh,v
retrieving revision 1.43
diff -u -w -r1.43 makesyscalls.sh
--- kern/makesyscalls.sh	2000/12/12 17:32:45	1.43
+++ kern/makesyscalls.sh	2000/12/28 00:11:18
@@ -55,6 +55,7 @@
 #	constprefix	the prefix for the system call constants
 #	registertype	the type for register_t
 #	nsysent		the size of the sysent table
+#	sys_nosys	name of the nosys function
 #
 # NOTE THAT THIS makesyscalls.sh DOES NOT SUPPORT 'LIBCOMPAT'.
 
@@ -126,6 +127,10 @@
 	    registertype = \"register_t\"
 	}
 	nsysent = \"$nsysent\"
+	sys_nosys = \"$sys_nosys\"
+	if (!sys_nosys) {
+	    sys_nosys = \"sys_nosys\"
+	}
 
 	sysdcl = \"$sysdcl\"
 	syscompat_pref = \"$syscompat_pref\"
@@ -148,7 +153,7 @@
 		printf "#define %s(func) __CONCAT(%s_,func)\n", compat[i], \
 		    compat[i] > sysent
 		printf "#else\n" > sysent
-		printf "#define %s(func) sys_nosys\n", compat[i] > sysent
+		printf "#define %s(func) %s\n", compat[i], sys_nosys > sysent
 		printf "#endif\n" > sysent
 	}
 
@@ -375,8 +380,8 @@
 
 	# output syscall switch entry
 	if (nodefs == "INDIR") {
-		printf("\t{ 0, 0,\n\t    sys_nosys },\t\t\t/* %d = %s (indir) */\n", \
-		    syscall, funcalias) > sysent
+		printf("\t{ 0, 0,\n\t    %s },\t\t\t/* %d = %s (indir) */\n", \
+		    sys_nosys, syscall, funcalias) > sysent
 	} else {
 #		printf("\t{ { %d", argc) > sysent
 #		for (i = 1; i <= argc; i++) {
@@ -474,8 +479,8 @@
 	for (i = 3; i <= NF; i++)
 		comment=comment " " $i
 
-	printf("\t{ 0, 0,\n\t    sys_nosys },\t\t\t/* %d = %s */\n", \
-	    syscall, comment) > sysent
+	printf("\t{ 0, 0,\n\t    %s },\t\t\t/* %d = %s */\n", \
+	    sys_nosys, syscall, comment) > sysent
 	printf("\t\"#%d (%s)\",\t\t/* %d = %s */\n", \
 	    syscall, comment, syscall, comment) > sysnamesbottom
 	if ($2 != "UNIMPL")
@@ -503,8 +508,8 @@
 			exit 1
 		}
 		while (syscall < nsysent) {
-			printf("\t{ 0, 0,\n\t    sys_nosys },\t\t\t/* %d = filler */\n", \
-			    syscall) > sysent
+			printf("\t{ 0, 0,\n\t    %s },\t\t\t/* %d = filler */\n", \
+			    sys_nosys, syscall) > sysent
 			syscall++
 		}
 	}

--=-=-=--