vadvise depend of COMPAT_43.

Now the kernel compile without COMPAT_43 option.

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 2e56200..a205b57 100644 (file)
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -105,7 +105,7 @@ struct sysent sysent[] = {
        { AS(sbrk_args), (sy_call_t *)sys_sbrk },       /* 69 = sbrk */
        { AS(sstk_args), (sy_call_t *)sys_sstk },       /* 70 = sstk */
        { compat(AS(ommap_args),mmap) },                /* 71 = old mmap */
-       { AS(ovadvise_args), (sy_call_t *)sys_ovadvise },       /* 72 = vadvise */
+       { compat(AS(ovadvise_args),vadvise) },          /* 72 = old vadvise */
        { AS(munmap_args), (sy_call_t *)sys_munmap },   /* 73 = munmap */
        { AS(mprotect_args), (sy_call_t *)sys_mprotect },       /* 74 = mprotect */
        { AS(madvise_args), (sy_call_t *)sys_madvise }, /* 75 = madvise */

diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 098063a..bf958e9 100644 (file)
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -79,7 +79,7 @@ const char *syscallnames[] = {
        "sbrk",                 /* 69 = sbrk */
        "sstk",                 /* 70 = sstk */
        "old.mmap",             /* 71 = old mmap */
-       "vadvise",                      /* 72 = vadvise */
+       "old.vadvise",          /* 72 = old vadvise */
        "munmap",                       /* 73 = munmap */
        "mprotect",                     /* 74 = mprotect */
        "madvise",                      /* 75 = madvise */

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index dc06f6c..ed70fb6 100644 (file)
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -136,7 +136,7 @@
 70     STD     BSD     { int sstk(int incr); }
 71     COMPAT  BSD     { int mmap(void *addr, int len, int prot, \
                            int flags, int fd, long pos); }
-72     STD     BSD     { int ovadvise(int anom); } vadvise ovadvise_args int
+72     COMPAT  BSD     { int vadvise(int anom); } vadvise ovadvise_args int
 73     STD     BSD     { int munmap(void *addr, size_t len); }
 74     STD     BSD     { int mprotect(void *addr, size_t len, int prot); }
 75     STD     BSD     { int madvise(void *addr, size_t len, int behav); }

diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index cba8709..d85c943 100644 (file)
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -70,7 +70,7 @@ HIDE_BSD(vfork)
 HIDE_BSD(sbrk)
 HIDE_BSD(sstk)
 HIDE_BSD(mmap)
-HIDE_BSD(ovadvise)
+HIDE_BSD(vadvise)
 HIDE_BSD(munmap)
 HIDE_BSD(mprotect)
 HIDE_BSD(madvise)

diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 94ac441..dba8aea 100644 (file)
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -76,7 +76,7 @@
 #define        SYS_sbrk        69
 #define        SYS_sstk        70
                                /* 71 is old mmap */
-#define        SYS_vadvise     72
+                               /* 72 is old vadvise */
 #define        SYS_munmap      73
 #define        SYS_mprotect    74
 #define        SYS_madvise     75

diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index f74896c..45bb7cd 100644 (file)
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -59,7 +59,6 @@ MIASM =  \
        vfork.o \
        sbrk.o \
        sstk.o \
-       vadvise.o \
        munmap.o \
        mprotect.o \
        madvise.o \

diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 23d65a7..b4df93c 100644 (file)
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -438,12 +438,6 @@ struct     sstk_args {
 #endif
        int     incr;   char incr_[PAD_(int)];
 };
-struct ovadvise_args {
-#ifdef _KERNEL
-       struct sysmsg sysmsg;
-#endif
-       int     anom;   char anom_[PAD_(int)];
-};
 struct munmap_args {
 #ifdef _KERNEL
        struct sysmsg sysmsg;
@@ -2343,6 +2337,12 @@ struct   ommap_args {
        int     fd;     char fd_[PAD_(int)];
        long    pos;    char pos_[PAD_(long)];
 };
+struct ovadvise_args {
+#ifdef _KERNEL
+       struct sysmsg sysmsg;
+#endif
+       int     anom;   char anom_[PAD_(int)];
+};
 struct gethostname_args {
 #ifdef _KERNEL
        struct sysmsg sysmsg;
@@ -2487,6 +2487,7 @@ int       sys_ofstat (struct ofstat_args *);
 int    sys_ogetkerninfo (struct getkerninfo_args *);
 int    sys_ogetpagesize (struct getpagesize_args *);
 int    sys_ommap (struct ommap_args *);
+int    sys_ovadvise (struct ovadvise_args *);
 int    sys_owait (struct owait_args *);
 int    sys_ogethostname (struct gethostname_args *);
 int    sys_osethostname (struct sethostname_args *);
@@ -2643,7 +2644,6 @@ int       sys_msync (struct msync_args *);
 int    sys_vfork (struct vfork_args *);
 int    sys_sbrk (struct sbrk_args *);
 int    sys_sstk (struct sstk_args *);
-int    sys_ovadvise (struct ovadvise_args *);
 int    sys_munmap (struct munmap_args *);
 int    sys_mprotect (struct mprotect_args *);
 int    sys_madvise (struct madvise_args *);

diff --git a/sys/sys/sysunion.h b/sys/sys/sysunion.h
index 66b970f..a0df514 100644 (file)
--- a/sys/sys/sysunion.h
+++ b/sys/sys/sysunion.h
@@ -91,7 +91,9 @@ union sysunion {
 #ifdef COMPAT_43
        struct  ommap_args sys_ommap;
 #endif
-       struct  ovadvise_args ovadvise;
+#ifdef COMPAT_43
+       struct  ovadvise_args vadvise;
+#endif
        struct  munmap_args munmap;
        struct  mprotect_args mprotect;
        struct  madvise_args madvise;