Module Name: src
Committed By: pgoyette
Date: Sat May 9 05:56:36 UTC 2015
Modified Files:
src/sys/kern: kern_syscall.c
Log Message:
Use the generated list of auto-loadable syscalls rather than our own
hard-coded list.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/kern_syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_syscall.c
diff -u src/sys/kern/kern_syscall.c:1.10 src/sys/kern/kern_syscall.c:1.11
--- src/sys/kern/kern_syscall.c:1.10 Sat Mar 7 16:38:07 2015
+++ src/sys/kern/kern_syscall.c Sat May 9 05:56:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_syscall.c,v 1.10 2015/03/07 16:38:07 christos Exp $ */
+/* $NetBSD: kern_syscall.c,v 1.11 2015/05/09 05:56:36 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_syscall.c,v 1.10 2015/03/07 16:38:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_syscall.c,v 1.11 2015/05/09 05:56:36 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -60,151 +60,8 @@ int
sys_nomodule(struct lwp *l, const void *v, register_t *retval)
{
#ifdef MODULAR
- static struct {
- u_int al_code;
- const char *al_module;
- } const autoload[] = {
- { SYS_aio_cancel, "aio" },
- { SYS_aio_error, "aio" },
- { SYS_aio_fsync, "aio" },
- { SYS_aio_read, "aio" },
- { SYS_aio_return, "aio" },
- { SYS___aio_suspend50, "aio" },
- { SYS_aio_write, "aio" },
- { SYS_lio_listio, "aio" },
- { SYS_mq_open, "mqueue" },
- { SYS_mq_close, "mqueue" },
- { SYS_mq_unlink, "mqueue" },
- { SYS_mq_getattr, "mqueue" },
- { SYS_mq_setattr, "mqueue" },
- { SYS_mq_notify, "mqueue" },
- { SYS_mq_send, "mqueue" },
- { SYS_mq_receive, "mqueue" },
- { SYS___mq_timedsend50, "mqueue" },
- { SYS___mq_timedreceive50, "mqueue" },
- { SYS_compat_43_fstat43, "compat" },
- { SYS_compat_43_lstat43, "compat" },
- { SYS_compat_43_oaccept, "compat" },
- { SYS_compat_43_ocreat, "compat" },
- { SYS_compat_43_oftruncate, "compat" },
- { SYS_compat_43_ogetdirentries, "compat" },
- { SYS_compat_43_ogetdtablesize, "compat" },
- { SYS_compat_43_ogethostid, "compat" },
- { SYS_compat_43_ogethostname, "compat" },
- { SYS_compat_43_ogetkerninfo, "compat" },
- { SYS_compat_43_ogetpagesize, "compat" },
- { SYS_compat_43_ogetpeername, "compat" },
- { SYS_compat_43_ogetrlimit, "compat" },
- { SYS_compat_43_ogetsockname, "compat" },
- { SYS_compat_43_okillpg, "compat" },
- { SYS_compat_43_olseek, "compat" },
- { SYS_compat_43_ommap, "compat" },
- { SYS_compat_43_oquota, "compat" },
- { SYS_compat_43_orecv, "compat" },
- { SYS_compat_43_orecvfrom, "compat" },
- { SYS_compat_43_orecvmsg, "compat" },
- { SYS_compat_43_osend, "compat" },
- { SYS_compat_43_osendmsg, "compat" },
- { SYS_compat_43_osethostid, "compat" },
- { SYS_compat_43_osethostname, "compat" },
- { SYS_compat_43_osetrlimit, "compat" },
- { SYS_compat_43_osigblock, "compat" },
- { SYS_compat_43_osigsetmask, "compat" },
- { SYS_compat_43_osigstack, "compat" },
- { SYS_compat_43_osigvec, "compat" },
- { SYS_compat_43_otruncate, "compat" },
- { SYS_compat_43_owait, "compat" },
- { SYS_compat_43_stat43, "compat" },
- { SYS_compat_09_ogetdomainname, "compat" },
- { SYS_compat_09_osetdomainname, "compat" },
- { SYS_compat_09_ouname, "compat" },
-#ifndef _LP64
- { SYS_compat_10_omsgsys, "compat" },
- { SYS_compat_10_osemsys, "compat" },
- { SYS_compat_10_oshmsys, "compat" },
-#endif
- { SYS_compat_12_fstat12, "compat" },
- { SYS_compat_12_getdirentries, "compat" },
- { SYS_compat_12_lstat12, "compat" },
- { SYS_compat_12_msync, "compat" },
- { SYS_compat_12_oreboot, "compat" },
- { SYS_compat_12_oswapon, "compat" },
- { SYS_compat_12_stat12, "compat" },
- { SYS_compat_13_sigaction13, "compat" },
- { SYS_compat_13_sigaltstack13, "compat" },
- { SYS_compat_13_sigpending13, "compat" },
- { SYS_compat_13_sigprocmask13, "compat" },
- { SYS_compat_13_sigreturn13, "compat" },
- { SYS_compat_13_sigsuspend13, "compat" },
- { SYS_compat_14___semctl, "compat" },
- { SYS_compat_14_msgctl, "compat" },
- { SYS_compat_14_shmctl, "compat" },
- { SYS_compat_16___sigaction14, "compat" },
- { SYS_compat_16___sigreturn14, "compat" },
- { SYS_compat_20_fhstatfs, "compat" },
- { SYS_compat_20_fstatfs, "compat" },
- { SYS_compat_20_getfsstat, "compat" },
- { SYS_compat_20_statfs, "compat" },
- { SYS_compat_30___fhstat30, "compat" },
- { SYS_compat_30___fstat13, "compat" },
- { SYS_compat_30___lstat13, "compat" },
- { SYS_compat_30___stat13, "compat" },
- { SYS_compat_30_fhopen, "compat" },
- { SYS_compat_30_fhstat, "compat" },
- { SYS_compat_30_fhstatvfs1, "compat" },
- { SYS_compat_30_getdents, "compat" },
- { SYS_compat_30_getfh, "compat" },
- { SYS_compat_30_socket, "compat" },
- { SYS_compat_40_mount, "compat" },
- { SYS_compat_50_wait4, "compat" },
- { SYS_compat_50_mknod, "compat" },
- { SYS_compat_50_setitimer, "compat" },
- { SYS_compat_50_getitimer, "compat" },
- { SYS_compat_50_select, "compat" },
- { SYS_compat_50_gettimeofday, "compat" },
- { SYS_compat_50_getrusage, "compat" },
- { SYS_compat_50_settimeofday, "compat" },
- { SYS_compat_50_utimes, "compat" },
- { SYS_compat_50_adjtime, "compat" },
- { SYS_compat_50_lfs_segwait, "compat" },
- { SYS_compat_50_futimes, "compat" },
- { SYS_compat_50_clock_gettime, "compat" },
- { SYS_compat_50_clock_settime, "compat" },
- { SYS_compat_50_clock_getres, "compat" },
- { SYS_compat_50_timer_settime, "compat" },
- { SYS_compat_50_timer_gettime, "compat" },
- { SYS_compat_50_nanosleep, "compat" },
- { SYS_compat_50___sigtimedwait, "compat" },
- { SYS_compat_50_mq_timedsend, "compat" },
- { SYS_compat_50_mq_timedreceive, "compat" },
- { SYS_compat_50_lutimes, "compat" },
- { SYS_compat_50_____semctl13, "compat" },
- { SYS_compat_50___msgctl13, "compat" },
- { SYS_compat_50___shmctl13, "compat" },
- { SYS_compat_50__lwp_park, "compat" },
- { SYS_compat_50_kevent, "compat" },
- { SYS_compat_50_pselect, "compat" },
- { SYS_compat_50_pollts, "compat" },
- { SYS_compat_50___stat30, "compat" },
- { SYS_compat_50___fstat30, "compat" },
- { SYS_compat_50___lstat30, "compat" },
- { SYS_compat_50___ntp_gettime30, "compat" },
- { SYS_compat_50___fhstat40, "compat" },
- { SYS_compat_50_aio_suspend, "compat" },
- { SYS_compat_60__lwp_park, "compat" },
- { SYS__ksem_init, "ksem" },
- { SYS__ksem_open, "ksem" },
- { SYS__ksem_unlink, "ksem" },
- { SYS__ksem_close, "ksem" },
- { SYS__ksem_post, "ksem" },
- { SYS__ksem_wait, "ksem" },
- { SYS__ksem_trywait, "ksem" },
- { SYS__ksem_getvalue, "ksem" },
- { SYS__ksem_destroy, "ksem" },
- { SYS__ksem_timedwait, "ksem" },
- { SYS_nfssvc, "nfsserver" },
- { SYS_afssys, "openafs" },
- };
+#include <kern/syscalls_autoload.c>
+
const struct sysent *sy;
const struct emul *em;
int code, i;
@@ -227,11 +84,11 @@ sys_nomodule(struct lwp *l, const void *
em = l->l_proc->p_emul;
if (em == &emul_netbsd) {
code = sy - em->e_sysent;
- for (i = 0; i < __arraycount(autoload); i++) {
- if (autoload[i].al_code != code) {
+ for (i = 0; i < __arraycount(syscalls_autoload); i++) {
+ if (syscalls_autoload[i].al_code != code) {
continue;
}
- if (module_autoload(autoload[i].al_module,
+ if (module_autoload(syscalls_autoload[i].al_module,
MODULE_CLASS_ANY) != 0 ||
sy->sy_call == sys_nomodule) {
break;
