Date: Wed, 21 Sep 2005 00:25:51 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 84025 for review Message-ID: <200509210025.j8L0PpCa044952@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=84025 Change 84025 by rwatson@rwatson_zoo on 2005/09/21 00:25:43 Correct mis-merge, rebuild linux i386 system call files. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#7 (text+ko) ==== @@ -277,7 +277,7 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; }; -struct getpriority_args { +struct linux_getpriority_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; }; @@ -759,7 +759,7 @@ int linux_readdir(struct thread *, struct linux_readdir_args *); int linux_mmap(struct thread *, struct linux_mmap_args *); int linux_truncate(struct thread *, struct linux_truncate_args *); -int getpriority(struct thread *, struct getpriority_args *); +int linux_getpriority(struct thread *, struct linux_getpriority_args *); int linux_statfs(struct thread *, struct linux_statfs_args *); int linux_fstatfs(struct thread *, struct linux_fstatfs_args *); int linux_ioperm(struct thread *, struct linux_ioperm_args *); ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#7 (text+ko) ==== @@ -93,7 +93,7 @@ #define LINUX_SYS_oftruncate 93 #define LINUX_SYS_fchmod 94 #define LINUX_SYS_fchown 95 -#define LINUX_SYS_getpriority 96 +#define LINUX_SYS_linux_getpriority 96 #define LINUX_SYS_setpriority 97 #define LINUX_SYS_linux_statfs 99 #define LINUX_SYS_linux_fstatfs 100 ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#11 (text+ko) ==== @@ -116,7 +116,7 @@ { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 93 = oftruncate */ { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 96 = getpriority */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#11 (text+ko) ==== @@ -182,7 +182,7 @@ 93 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); } 94 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } 95 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } -96 AUE_GETPRIORITY MSTD { int getpriority(int which, int who); } +96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } 97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ int prio); } 98 AUE_NULL UNIMPL profil
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509210025.j8L0PpCa044952>