diff -ur src.old/sys/kern/syscalls.master src/sys/kern/syscalls.master --- src.old/sys/kern/syscalls.master Sat Apr 29 18:56:44 2006 +++ src/sys/kern/syscalls.master Mon Jun 26 22:53:52 2006 @@ -339,9 +339,9 @@ ; XXX should be { int shmsys(int which, ...); } 172 AUE_NULL UNIMPL nosys 173 AUE_PREAD MSTD { ssize_t pread(int fd, void *buf, \ - size_t nbyte, int pad, off_t offset); } + size_t nbyte, off_t offset); } 174 AUE_PWRITE MSTD { ssize_t pwrite(int fd, const void *buf, \ - size_t nbyte, int pad, off_t offset); } + size_t nbyte, off_t offset); } 175 AUE_NULL UNIMPL nosys 176 AUE_ADJTIME MSTD { int ntp_adjtime(struct timex *tp); } 177 AUE_NULL UNIMPL sfork (BSD/OS 2.x) @@ -372,16 +372,13 @@ 196 AUE_GETDIRENTRIES MSTD { int getdirentries(int fd, char *buf, \ u_int count, long *basep); } 197 AUE_MMAP MSTD { caddr_t mmap(caddr_t addr, size_t len, \ - int prot, int flags, int fd, int pad, \ - off_t pos); } + int prot, int flags, int fd, off_t pos); } 198 AUE_NULL MSTD { int nosys(void); } __syscall \ __syscall_args int -199 AUE_LSEEK MSTD { off_t lseek(int fd, int pad, off_t offset, \ +199 AUE_LSEEK MSTD { off_t lseek(int fd, off_t offset, \ int whence); } -200 AUE_TRUNCATE MSTD { int truncate(char *path, int pad, \ - off_t length); } -201 AUE_FTRUNCATE MSTD { int ftruncate(int fd, int pad, \ - off_t length); } +200 AUE_TRUNCATE MSTD { int truncate(char *path, off_t length); } +201 AUE_FTRUNCATE MSTD { int ftruncate(int fd, off_t length); } 202 AUE_SYSCTL MSTD { int __sysctl(int *name, u_int namelen, \ void *old, size_t *oldlenp, void *new, \ size_t newlen); } __sysctl sysctl_args int diff -ur src.old/sys/kern/vfs_syscalls.c src/sys/kern/vfs_syscalls.c --- src.old/sys/kern/vfs_syscalls.c Sat Apr 29 18:56:44 2006 +++ src/sys/kern/vfs_syscalls.c Mon Jun 26 22:56:57 2006 @@ -1716,7 +1716,6 @@ #ifndef _SYS_SYSPROTO_H_ struct lseek_args { int fd; - int pad; off_t offset; int whence; }; @@ -1726,7 +1725,6 @@ struct thread *td; register struct lseek_args /* { int fd; - int pad; off_t offset; int whence; } */ *uap; @@ -1812,7 +1810,6 @@ { struct lseek_args /* { int fd; - int pad; off_t offset; int whence; } */ nuap; @@ -3001,7 +2998,6 @@ #ifndef _SYS_SYSPROTO_H_ struct truncate_args { char *path; - int pad; off_t length; }; #endif @@ -3010,7 +3006,6 @@ struct thread *td; register struct truncate_args /* { char *path; - int pad; off_t length; } */ *uap; { @@ -3067,7 +3062,6 @@ #ifndef _SYS_SYSPROTO_H_ struct ftruncate_args { int fd; - int pad; off_t length; }; #endif @@ -3076,7 +3070,6 @@ struct thread *td; register struct ftruncate_args /* { int fd; - int pad; off_t length; } */ *uap; { @@ -3143,7 +3136,6 @@ { struct truncate_args /* { char *path; - int pad; off_t length; } */ nuap; @@ -3171,7 +3163,6 @@ { struct ftruncate_args /* { int fd; - int pad; off_t length; } */ nuap; diff -ur src.old/lib/libc/sys/Makefile.inc src/lib/libc/sys/Makefile.inc --- src.old/lib/libc/sys/Makefile.inc Sat Apr 29 18:57:47 2006 +++ src/lib/libc/sys/Makefile.inc Mon Jun 26 22:54:35 2006 @@ -18,7 +18,7 @@ .endif # Sources common to both syscall interfaces: -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c +SRCS+= __error.c # Add machine dependent asm sources: SRCS+=${MDASM}