COMPAT_09 is now extra officially dead.  Only one function actually
used, moved to linux compat.

Index: compat/linux/linux_misc.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/compat/linux/linux_misc.c,v
retrieving revision 1.70
diff -u -p -r1.70 linux_misc.c
--- compat/linux/linux_misc.c   8 Jul 2011 05:01:27 -0000       1.70
+++ compat/linux/linux_misc.c   8 Jul 2011 09:46:55 -0000
@@ -1453,3 +1453,16 @@ linux_sys_mprotect(struct proc *p, void 
                SCARG(uap, prot) |= PROT_READ;
        return (sys_mprotect(p, uap, retval));
 }
+
+int
+linux_sys_setdomainname(struct proc *p, void *v, register_t *retval)
+{
+       struct linux_sys_setdomainname_args *uap = v;
+       int error, mib[1];
+       
+       if ((error = suser(p, 0)))
+               return (error);
+       mib[0] = KERN_DOMAINNAME;
+       return (kern_sysctl(mib, 1, NULL, NULL, SCARG(uap, name),
+           SCARG(uap, len), p));
+}
Index: compat/linux/syscalls.master
===================================================================
RCS file: /home/tedu/cvs/src/sys/compat/linux/syscalls.master,v
retrieving revision 1.58
diff -u -p -r1.58 syscalls.master
--- compat/linux/syscalls.master        8 Jul 2011 05:01:27 -0000       1.58
+++ compat/linux/syscalls.master        8 Jul 2011 09:38:49 -0000
@@ -213,8 +213,7 @@
 119    STD             { int linux_sys_sigreturn(struct linux_sigcontext 
*scp); }
 120    STD             { int linux_sys_clone(int flags, void *stack, \
                            void *parent_tidptr, void *tls, void 
*child_tidptr); }
-121    NOARGS          { int compat_09_sys_setdomainname(char *name, \
-                           int len); }
+121    STD             { int linux_sys_setdomainname(char *name, int len); }
 122    STD             { int linux_sys_uname(struct linux_utsname *up); }
 #ifdef __i386__
 123    STD             { int linux_sys_modify_ldt(int func, void *ptr, \
Index: conf/files
===================================================================
RCS file: /home/tedu/cvs/src/sys/conf/files,v
retrieving revision 1.520
diff -u -p -r1.520 files
--- conf/files  7 Jul 2011 02:57:24 -0000       1.520
+++ conf/files  8 Jul 2011 09:39:14 -0000
@@ -1052,7 +1052,6 @@ file compat/common/compat_exec.c  !small_
 file compat/common/compat_util.c       !small_kernel
 file compat/common/compat_dir.c                !small_kernel
 file compat/common/compat_vm.c         !small_kernel & compat_linux
-file compat/common/kern_info_09.c      !small_kernel & compat_linux
 file compat/common/tty_43.c            compat_43
 
 # libx86emu
Index: kern/syscalls.master
===================================================================
RCS file: /home/tedu/cvs/src/sys/kern/syscalls.master,v
retrieving revision 1.112
diff -u -p -r1.112 syscalls.master
--- kern/syscalls.master        8 Jul 2011 05:01:27 -0000       1.112
+++ kern/syscalls.master        8 Jul 2011 09:37:01 -0000
@@ -281,33 +281,16 @@
 159    UNIMPL
 160    UNIMPL
 161    STD             { int sys_getfh(const char *fname, fhandle_t *fhp); }
-162    COMPAT_09       { int sys_getdomainname(char *domainname, int len); } \
-                           ogetdomainname
-163    COMPAT_09       { int sys_setdomainname(char *domainname, int len); } \
-                           osetdomainname
+162    OBSOL           ogetdomainname
+163    OBSOL           osetdomainname
 164    UNIMPL          ouname
 165    STD             { int sys_sysarch(int op, void *parms); }
 166    UNIMPL
 167    UNIMPL
 168    UNIMPL
-#if defined(SYSVSEM) && !defined(__LP64__)
-169    COMPAT_10       { int sys_semsys(int which, int a2, int a3, int a4, \
-                           int a5); } osemsys
-#else
-169    UNIMPL          1.0 semsys
-#endif
-#if defined(SYSVMSG) && !defined(__LP64__)
-170    COMPAT_10       { int sys_msgsys(int which, int a2, int a3, int a4, \
-                           int a5, int a6); } omsgsys
-#else
-170    UNIMPL          1.0 msgsys
-#endif
-#if defined(SYSVSHM) && !defined(__LP64__)
-171    COMPAT_10       { int sys_shmsys(int which, int a2, int a3, int a4); } \
-                           oshmsys
-#else
-171    UNIMPL          1.0 shmsys
-#endif
+169    OBSOL           semsys10
+170    OBSOL           msgsys10
+171    OBSOL           shmsys10
 172    UNIMPL
 173    STD             { ssize_t sys_pread(int fd, void *buf, \
                          size_t nbyte, int pad, off_t offset); }

Reply via email to