Source-Changes-HG archive

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

[src/pgoyette-compat]: src/sys/kern Update compat module names to reference t...



details:   https://anonhg.NetBSD.org/src/rev/64914e5f5670
branches:  pgoyette-compat
changeset: 321162:64914e5f5670
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Apr 17 23:58:48 2018 +0000

description:
Update compat module names to reference the version-specific modules.

This way, when we autoload compat code we load only what is needed,
and nothing "older".

diffstat:

 sys/kern/syscalls.master |  255 ++++++++++++++++++++++++----------------------
 1 files changed, 131 insertions(+), 124 deletions(-)

diffs (truncated from 636 to 300 lines):

diff -r beb64ebf12d0 -r 64914e5f5670 sys/kern/syscalls.master
--- a/sys/kern/syscalls.master  Tue Apr 17 23:06:11 2018 +0000
+++ b/sys/kern/syscalls.master  Tue Apr 17 23:58:48 2018 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.291.2.6 2018/03/27 23:08:44 pgoyette Exp $
+       $NetBSD: syscalls.master,v 1.291.2.7 2018/04/17 23:58:48 pgoyette Exp $
 
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
 
@@ -76,28 +76,28 @@
 5      STD      RUMP   { int|sys||open(const char *path, \
                            int flags, ... mode_t mode); }
 6      STD      RUMP   { int|sys||close(int fd); }
-7      COMPAT_50 MODULAR compat { int|sys||wait4(pid_t pid, int *status, \
+7      COMPAT_50 MODULAR compat_50 { int|sys||wait4(pid_t pid, int *status, \
                            int options, struct rusage50 *rusage); }
-8      COMPAT_43 MODULAR compat        \
+8      COMPAT_43 MODULAR compat_43     \
                { int|sys||creat(const char *path, mode_t mode); } ocreat
 9      STD      RUMP   { int|sys||link(const char *path, const char *link); }
 10     STD      RUMP   { int|sys||unlink(const char *path); }
 11     OBSOL           execv
 12     STD      RUMP   { int|sys||chdir(const char *path); }
 13     STD      RUMP   { int|sys||fchdir(int fd); }
-14     COMPAT_50 MODULAR compat RUMP   \
+14     COMPAT_50 MODULAR compat_50 RUMP        \
                { int|sys||mknod(const char *path, mode_t mode, uint32_t dev); }
 15     STD      RUMP   { int|sys||chmod(const char *path, mode_t mode); }
 16     STD      RUMP   { int|sys||chown(const char *path, uid_t uid, \
                            gid_t gid); }
 17     STD             { int|sys||obreak(char *nsize); } break
-18     COMPAT_20 MODULAR compat { int|sys||getfsstat(struct statfs12 *buf, \
+18     COMPAT_20 MODULAR compat_20 { int|sys||getfsstat(struct statfs12 *buf, \
                            long bufsize, int flags); }
-19     COMPAT_43 MODULAR compat        \
+19     COMPAT_43 MODULAR compat_43     \
                { long|sys||lseek(int fd, long offset, int whence); }\
                            olseek
 20     NOERR   RUMP    { pid_t|sys||getpid_with_ppid(void); } getpid
-21     COMPAT_40 MODULAR compat        \
+21     COMPAT_40 MODULAR compat_40     \
                { int|sys||mount(const char *type, const char *path, \
                            int flags, void *data); }
 22     STD     RUMP    { int|sys||unmount(const char *path, int flags); }
@@ -125,10 +125,10 @@
 35     STD     RUMP    { int|sys||fchflags(int fd, u_long flags); }
 36     NOERR    RUMP   { void|sys||sync(void); }
 37     STD             { int|sys||kill(pid_t pid, int signum); }
-38     COMPAT_43 MODULAR compat        \
+38     COMPAT_43 MODULAR compat_43     \
                { int|sys||stat(const char *path, struct stat43 *ub); } stat43
 39     NOERR   RUMP    { pid_t|sys||getppid(void); }
-40     COMPAT_43 MODULAR compat        \
+40     COMPAT_43 MODULAR compat_43     \
                { int|sys||lstat(const char *path, \
                            struct stat43 *ub); } lstat43
 41     STD     RUMP    { int|sys||dup(int fd); }
@@ -138,22 +138,22 @@
                            u_long offset, u_int scale); }
 45     STD     RUMP    { int|sys||ktrace(const char *fname, int ops, \
                            int facs, pid_t pid); }
-46     COMPAT_13 MODULAR compat { int|sys||sigaction(int signum, \
+46     COMPAT_13 MODULAR compat_13 { int|sys||sigaction(int signum, \
                            const struct sigaction13 *nsa, \
                            struct sigaction13 *osa); } sigaction13
 47     NOERR   RUMP    { gid_t|sys||getgid_with_egid(void); } getgid
-48     COMPAT_13 MODULAR compat { int|sys||sigprocmask(int how, \
+48     COMPAT_13 MODULAR compat_13 { int|sys||sigprocmask(int how, \
                            int mask); } sigprocmask13
 49     STD     RUMP    { int|sys||__getlogin(char *namebuf, size_t namelen); }
 50     STD     RUMP    { int|sys||__setlogin(const char *namebuf); }
 51     STD             { int|sys||acct(const char *path); }
-52     COMPAT_13 MODULAR compat { int|sys||sigpending(void); } sigpending13
-53     COMPAT_13 MODULAR compat { int|sys||sigaltstack( \
+52     COMPAT_13 MODULAR compat_13 { int|sys||sigpending(void); } sigpending13
+53     COMPAT_13 MODULAR compat_13 { int|sys||sigaltstack( \
                            const struct sigaltstack13 *nss, \
                            struct sigaltstack13 *oss); } sigaltstack13
 54     STD     RUMP    { int|sys||ioctl(int fd, \
                            u_long com, ... void *data); }
-55     COMPAT_12 MODULAR compat { int|sys||reboot(int opt); } oreboot
+55     COMPAT_12 MODULAR compat_12 { int|sys||reboot(int opt); } oreboot
 56     STD      RUMP   { int|sys||revoke(const char *path); }
 57     STD      RUMP   { int|sys||symlink(const char *path, \
                            const char *link); }
@@ -163,21 +163,21 @@
                            char * const *argp, char * const *envp); }
 60     STD      RUMP   { mode_t|sys||umask(mode_t newmask); }
 61     STD      RUMP   { int|sys||chroot(const char *path); }
-62     COMPAT_43 MODULAR compat        \
+62     COMPAT_43 MODULAR compat_43     \
                { int|sys||fstat(int fd, struct stat43 *sb); } fstat43
-63     COMPAT_43 MODULAR compat        \
+63     COMPAT_43 MODULAR compat_43     \
                { int|sys||getkerninfo(int op, char *where, int *size, \
                            int arg); } ogetkerninfo
-64     COMPAT_43 MODULAR compat        \
+64     COMPAT_43 MODULAR compat_43     \
                { int|sys||getpagesize(void); } ogetpagesize
-65     COMPAT_12 MODULAR compat { int|sys||msync(void *addr, size_t len); }
+65     COMPAT_12 MODULAR compat_12 { int|sys||msync(void *addr, size_t len); }
 ; XXX COMPAT_??? for 4.4BSD-compatible vfork(2)?
 66     STD             { int|sys||vfork(void); }
 67     OBSOL           vread
 68     OBSOL           vwrite
 69     OBSOL           sbrk
 70     OBSOL           sstk
-71     COMPAT_43 MODULAR compat        \
+71     COMPAT_43 MODULAR compat_43     \
                { int|sys||mmap(void *addr, size_t len, int prot, \
                            int flags, int fd, long pos); } ommap
 72     STD             { int|sys||ovadvise(int anom); } vadvise
@@ -196,43 +196,44 @@
                            const gid_t *gidset); }
 81     STD     RUMP    { int|sys||getpgrp(void); }
 82     STD     RUMP    { int|sys||setpgid(pid_t pid, pid_t pgid); }
-83     COMPAT_50 MODULAR compat { int|sys||setitimer(int which, \
+83     COMPAT_50 MODULAR compat_50 { int|sys||setitimer(int which, \
                            const struct itimerval50 *itv, \
                            struct itimerval50 *oitv); }
-84     COMPAT_43 MODULAR compat { int|sys||wait(void); } owait
-85     COMPAT_12 MODULAR compat { int|sys||swapon(const char *name); } oswapon
-86     COMPAT_50 MODULAR compat { int|sys||getitimer(int which, \
+84     COMPAT_43 MODULAR compat_43 { int|sys||wait(void); } owait
+85     COMPAT_12 MODULAR compat_12 { int|sys||swapon(const char *name); } \
+                           oswapon
+86     COMPAT_50 MODULAR compat_50 { int|sys||getitimer(int which, \
                            struct itimerval50 *itv); }
-87     COMPAT_43 MODULAR compat        \
+87     COMPAT_43 MODULAR compat_43     \
                { int|sys||gethostname(char *hostname, u_int len); } \
                            ogethostname
-88     COMPAT_43 MODULAR compat        \
+88     COMPAT_43 MODULAR compat_43     \
                { int|sys||sethostname(char *hostname, u_int len); } \
                            osethostname
-89     COMPAT_43 MODULAR compat        \
+89     COMPAT_43 MODULAR compat_43     \
                { int|sys||getdtablesize(void); } ogetdtablesize
 90     STD      RUMP   { int|sys||dup2(int from, int to); }
 91     UNIMPL          getdopt
 92     STD     RUMP    { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-93     COMPAT_50 MODULAR compat RUMP   \
+93     COMPAT_50 MODULAR compat_50 RUMP        \
                { int|sys||select(int nd, fd_set *in, fd_set *ou, \
                            fd_set *ex, struct timeval50 *tv); }
 94     UNIMPL          setdopt
 95     STD     RUMP    { int|sys||fsync(int fd); }
 96     STD             { int|sys||setpriority(int which, id_t who, int prio); }
-97     COMPAT_30 MODULAR compat        \
+97     COMPAT_30 MODULAR compat_30     \
                { int|sys||socket(int domain, int type, int protocol); }
 98     STD     RUMP    { int|sys||connect(int s, const struct sockaddr *name, \
                            socklen_t namelen); }
-99     COMPAT_43 MODULAR compat        \
+99     COMPAT_43 MODULAR compat_43     \
                { int|sys||accept(int s, void *name, \
                            socklen_t *anamelen); } oaccept
 100    STD             { int|sys||getpriority(int which, id_t who); }
-101    COMPAT_43 MODULAR compat { int|sys||send(int s, void *buf, int len, \
+101    COMPAT_43 MODULAR compat_43 { int|sys||send(int s, void *buf, int len, \
                            int flags); } osend
-102    COMPAT_43 MODULAR compat { int|sys||recv(int s, void *buf, int len, \
+102    COMPAT_43 MODULAR compat_43 { int|sys||recv(int s, void *buf, int len, \
                            int flags); } orecv
-103    COMPAT_13 MODULAR compat        \
+103    COMPAT_13 MODULAR compat_13     \
                { int|sys||sigreturn(struct sigcontext13 *sigcntxp); } \
                            sigreturn13
 104    STD     RUMP    { int|sys||bind(int s, const struct sockaddr *name, \
@@ -241,23 +242,23 @@
                            const void *val, socklen_t valsize); }
 106    STD     RUMP    { int|sys||listen(int s, int backlog); }
 107    OBSOL           vtimes
-108    COMPAT_43 MODULAR compat        \
+108    COMPAT_43 MODULAR compat_43     \
                { int|sys||sigvec(int signum, struct sigvec *nsv, \
                            struct sigvec *osv); } osigvec
 109    COMPAT_43 MODULAR compat { int|sys||sigblock(int mask); } osigblock
 110    COMPAT_43 MODULAR compat { int|sys||sigsetmask(int mask); } osigsetmask
 111    COMPAT_13 MODULAR compat { int|sys||sigsuspend(int mask); } sigsuspend13
-112    COMPAT_43 MODULAR compat { int|sys||sigstack(struct sigstack *nss, \
+112    COMPAT_43 MODULAR compat_43 { int|sys||sigstack(struct sigstack *nss, \
                            struct sigstack *oss); } osigstack
-113    COMPAT_43 MODULAR compat        \
+113    COMPAT_43 MODULAR compat_43     \
                { int|sys||recvmsg(int s, struct omsghdr *msg, \
                            int flags); } orecvmsg
-114    COMPAT_43 MODULAR compat        \
+114    COMPAT_43 MODULAR compat_43     \
                { int|sys||sendmsg(int s, void *msg, int flags); } osendmsg
 115    OBSOL           vtrace
-116    COMPAT_50 MODULAR compat { int|sys||gettimeofday(struct timeval50 *tp, \
-                           void *tzp); }
-117    COMPAT_50 MODULAR compat        \
+116    COMPAT_50 MODULAR compat_50     \
+               { int|sys||gettimeofday(struct timeval50 *tp, void *tzp); }
+117    COMPAT_50 MODULAR compat_50     \
                { int|sys||getrusage(int who, struct rusage50 *rusage); }
 118    STD     RUMP    { int|sys||getsockopt(int s, int level, int name, \
                            void *val, socklen_t *avalsize); }
@@ -266,21 +267,21 @@
                            const struct iovec *iovp, int iovcnt); }
 121    STD     RUMP    { ssize_t|sys||writev(int fd, \
                            const struct iovec *iovp, int iovcnt); }
-122    COMPAT_50 MODULAR compat        \
+122    COMPAT_50 MODULAR compat_50     \
                { int|sys||settimeofday(const struct timeval50 *tv, \
                            const void *tzp); }
 123    STD      RUMP   { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
 124    STD      RUMP   { int|sys||fchmod(int fd, mode_t mode); }
-125    COMPAT_43 MODULAR compat        \
+125    COMPAT_43 MODULAR compat_43     \
                { int|sys||recvfrom(int s, void *buf, size_t len, \
                            int flags, void *from, socklen_t *fromlenaddr); } \
                            orecvfrom
 126    STD     RUMP    { int|sys||setreuid(uid_t ruid, uid_t euid); }
 127    STD     RUMP    { int|sys||setregid(gid_t rgid, gid_t egid); }
 128    STD      RUMP   { int|sys||rename(const char *from, const char *to); }
-129    COMPAT_43 MODULAR compat        \
+129    COMPAT_43 MODULAR compat_43     \
                { int|sys||truncate(const char *path, long length); } otruncate
-130    COMPAT_43 MODULAR compat        \
+130    COMPAT_43 MODULAR compat_43     \
                { int|sys||ftruncate(int fd, long length); } oftruncate
 131    STD      RUMP   { int|sys||flock(int fd, int how); }
 132    STD      RUMP   { int|sys||mkfifo(const char *path, mode_t mode); }
@@ -292,32 +293,32 @@
                            int protocol, int *rsv); }
 136    STD      RUMP   { int|sys||mkdir(const char *path, mode_t mode); }
 137    STD      RUMP   { int|sys||rmdir(const char *path); }
-138    COMPAT_50 MODULAR compat RUMP { int|sys||utimes(const char *path, \
+138    COMPAT_50 MODULAR compat_50 RUMP { int|sys||utimes(const char *path, \
                            const struct timeval50 *tptr); }
 139    OBSOL           4.2 sigreturn
-140    COMPAT_50 MODULAR compat        \
+140    COMPAT_50 MODULAR compat_50     \
                { int|sys||adjtime(const struct timeval50 *delta, \
                            struct timeval50 *olddelta); }
-141    COMPAT_43 MODULAR compat        \
+141    COMPAT_43 MODULAR compat_43     \
                { int|sys||getpeername(int fdes, void *asa, \
                            socklen_t *alen); } ogetpeername
-142    COMPAT_43 MODULAR compat        \
+142    COMPAT_43 MODULAR compat_43     \
                { int32_t|sys||gethostid(void); } ogethostid
-143    COMPAT_43 MODULAR compat        \
+143    COMPAT_43 MODULAR compat_43     \
                { int|sys||sethostid(int32_t hostid); } osethostid
-144    COMPAT_43 MODULAR compat        \
+144    COMPAT_43 MODULAR compat_43     \
                { int|sys||getrlimit(int which, \
                            struct orlimit *rlp); } ogetrlimit
-145    COMPAT_43 MODULAR compat { int|sys||setrlimit(int which, \
+145    COMPAT_43 MODULAR compat_43 { int|sys||setrlimit(int which, \
                            const struct orlimit *rlp); } osetrlimit
-146    COMPAT_43 MODULAR compat        \
+146    COMPAT_43 MODULAR compat_43     \
                { int|sys||killpg(int pgid, int signum); } okillpg
 147    STD     RUMP    { int|sys||setsid(void); }
 148    COMPAT_50 MODULAR XXX { int|sys||quotactl(const char *path, int cmd, \
                            int uid, void *arg); }
-149    COMPAT_43 MODULAR compat { int|sys||quota(void); } oquota
-150    COMPAT_43 MODULAR compat { int|sys||getsockname(int fdec, void *asa, \
-                           socklen_t *alen); } ogetsockname
+149    COMPAT_43 MODULAR compat_43 { int|sys||quota(void); } oquota
+150    COMPAT_43 MODULAR compat_43 { int|sys||getsockname(int fdec,    \
+                           void *asa, socklen_t *alen); } ogetsockname
 
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibity
@@ -328,21 +329,21 @@
 153    UNIMPL
 154    UNIMPL
 155    STD MODULAR nfsserver RUMP  { int|sys||nfssvc(int flag, void *argp); }
-156    COMPAT_43 MODULAR compat        \
+156    COMPAT_43 MODULAR compat_43     \
                { int|sys||getdirentries(int fd, char *buf, \
                            u_int count, long *basep); } ogetdirentries
-157    COMPAT_20 MODULAR compat { int|sys||statfs(const char *path, \
+157    COMPAT_20 MODULAR compat_20 { int|sys||statfs(const char *path, \
                            struct statfs12 *buf); }
-158    COMPAT_20 MODULAR compat        \
+158    COMPAT_20 MODULAR compat_20     \
                { int|sys||fstatfs(int fd, struct statfs12 *buf); }
 159    UNIMPL
 160    UNIMPL
-161    COMPAT_30 MODULAR compat { int|sys||getfh(const char *fname, \
+161    COMPAT_30 MODULAR compat_30 { int|sys||getfh(const char *fname, \
                            struct compat_30_fhandle *fhp); }
-162    COMPAT_09 MODULAR compat        \
+162    COMPAT_09 MODULAR compat_09     \
                { int|sys||getdomainname(char *domainname, int len); } \
                            ogetdomainname
-163    COMPAT_09 MODULAR compat        \
+163    COMPAT_09 MODULAR compat_09     \
                { int|sys||setdomainname(char *domainname, int len); } \
                            osetdomainname
 164    COMPAT_09 MODULAR compat        \
@@ -353,7 +354,7 @@



Home | Main Index | Thread Index | Old Index