PERFORCE change 46608 for review
John Baldwin
jhb at FreeBSD.org
Fri Feb 6 12:35:40 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=46608
Change 46608 by jhb at jhb_slimer on 2004/02/06 12:32:59
IFC @46607 (Loop back various merges).
Affected files ...
.. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#6 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#5 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#5 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#5 integrate
.. //depot/projects/smpng/sys/compat/svr4/syscalls.master#5 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#36 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#6 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#5 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#6 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#5 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#43 integrate
.. //depot/projects/smpng/sys/sys/resourcevar.h#17 integrate
Differences ...
==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#6 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.14 2004/02/04 22:00:41 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.14 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.15 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp
*/
#ifndef _SVR4_SYSPROTO_H_
==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#5 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.12 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.14 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.13 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp
*/
#define SVR4_SYS_exit 1
==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#5 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.12 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.14 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.13 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp
*/
const char *svr4_syscallnames[] = {
==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#5 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.13 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.14 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.14 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp
*/
#include <sys/types.h>
@@ -22,10 +22,10 @@
{ 0, (sy_call_t *)nosys }, /* 0 = unused */
{ AS(sys_exit_args), (sy_call_t *)sys_exit }, /* 1 = exit */
{ SYF_MPSAFE | 0, (sy_call_t *)fork }, /* 2 = fork */
- { AS(read_args), (sy_call_t *)read }, /* 3 = read */
- { AS(write_args), (sy_call_t *)write }, /* 4 = write */
+ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read }, /* 3 = read */
+ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */
{ AS(svr4_sys_open_args), (sy_call_t *)svr4_sys_open }, /* 5 = svr4_sys_open */
- { AS(close_args), (sy_call_t *)close }, /* 6 = close */
+ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */
{ AS(svr4_sys_wait_args), (sy_call_t *)svr4_sys_wait }, /* 7 = svr4_sys_wait */
{ AS(svr4_sys_creat_args), (sy_call_t *)svr4_sys_creat }, /* 8 = svr4_sys_creat */
{ AS(link_args), (sy_call_t *)link }, /* 9 = link */
@@ -39,35 +39,35 @@
{ AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break }, /* 17 = svr4_sys_break */
{ AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat }, /* 18 = svr4_sys_stat */
{ AS(lseek_args), (sy_call_t *)lseek }, /* 19 = lseek */
- { 0, (sy_call_t *)getpid }, /* 20 = getpid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getpid }, /* 20 = getpid */
{ 0, (sy_call_t *)nosys }, /* 21 = old_mount */
{ 0, (sy_call_t *)nosys }, /* 22 = sysv_umount */
- { AS(setuid_args), (sy_call_t *)setuid }, /* 23 = setuid */
- { 0, (sy_call_t *)getuid }, /* 24 = getuid */
+ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid }, /* 23 = setuid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getuid }, /* 24 = getuid */
{ 0, (sy_call_t *)nosys }, /* 25 = stime */
{ 0, (sy_call_t *)nosys }, /* 26 = ptrace */
{ AS(svr4_sys_alarm_args), (sy_call_t *)svr4_sys_alarm }, /* 27 = svr4_sys_alarm */
{ AS(svr4_sys_fstat_args), (sy_call_t *)svr4_sys_fstat }, /* 28 = svr4_sys_fstat */
- { 0, (sy_call_t *)svr4_sys_pause }, /* 29 = svr4_sys_pause */
+ { SYF_MPSAFE | 0, (sy_call_t *)svr4_sys_pause }, /* 29 = svr4_sys_pause */
{ AS(svr4_sys_utime_args), (sy_call_t *)svr4_sys_utime }, /* 30 = svr4_sys_utime */
{ 0, (sy_call_t *)nosys }, /* 31 = stty */
{ 0, (sy_call_t *)nosys }, /* 32 = gtty */
{ AS(svr4_sys_access_args), (sy_call_t *)svr4_sys_access }, /* 33 = svr4_sys_access */
- { AS(svr4_sys_nice_args), (sy_call_t *)svr4_sys_nice }, /* 34 = svr4_sys_nice */
+ { SYF_MPSAFE | AS(svr4_sys_nice_args), (sy_call_t *)svr4_sys_nice }, /* 34 = svr4_sys_nice */
{ 0, (sy_call_t *)nosys }, /* 35 = statfs */
{ 0, (sy_call_t *)sync }, /* 36 = sync */
- { AS(svr4_sys_kill_args), (sy_call_t *)svr4_sys_kill }, /* 37 = svr4_sys_kill */
+ { SYF_MPSAFE | AS(svr4_sys_kill_args), (sy_call_t *)svr4_sys_kill }, /* 37 = svr4_sys_kill */
{ 0, (sy_call_t *)nosys }, /* 38 = fstatfs */
- { AS(svr4_sys_pgrpsys_args), (sy_call_t *)svr4_sys_pgrpsys }, /* 39 = svr4_sys_pgrpsys */
+ { SYF_MPSAFE | AS(svr4_sys_pgrpsys_args), (sy_call_t *)svr4_sys_pgrpsys }, /* 39 = svr4_sys_pgrpsys */
{ 0, (sy_call_t *)nosys }, /* 40 = xenix */
- { AS(dup_args), (sy_call_t *)dup }, /* 41 = dup */
- { 0, (sy_call_t *)pipe }, /* 42 = pipe */
+ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup }, /* 41 = dup */
+ { SYF_MPSAFE | 0, (sy_call_t *)pipe }, /* 42 = pipe */
{ AS(svr4_sys_times_args), (sy_call_t *)svr4_sys_times }, /* 43 = svr4_sys_times */
{ 0, (sy_call_t *)nosys }, /* 44 = profil */
{ 0, (sy_call_t *)nosys }, /* 45 = plock */
- { AS(setgid_args), (sy_call_t *)setgid }, /* 46 = setgid */
- { 0, (sy_call_t *)getgid }, /* 47 = getgid */
- { AS(svr4_sys_signal_args), (sy_call_t *)svr4_sys_signal }, /* 48 = svr4_sys_signal */
+ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid }, /* 46 = setgid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getgid }, /* 47 = getgid */
+ { SYF_MPSAFE | AS(svr4_sys_signal_args), (sy_call_t *)svr4_sys_signal }, /* 48 = svr4_sys_signal */
#if defined(NOTYET)
{ AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys }, /* 49 = svr4_sys_msgsys */
#else
@@ -83,7 +83,7 @@
{ AS(svr4_sys_utssys_args), (sy_call_t *)svr4_sys_utssys }, /* 57 = svr4_sys_utssys */
{ AS(fsync_args), (sy_call_t *)fsync }, /* 58 = fsync */
{ AS(svr4_sys_execve_args), (sy_call_t *)svr4_sys_execve }, /* 59 = svr4_sys_execve */
- { AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */
+ { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */
{ AS(chroot_args), (sy_call_t *)chroot }, /* 61 = chroot */
{ AS(svr4_sys_fcntl_args), (sy_call_t *)svr4_sys_fcntl }, /* 62 = svr4_sys_fcntl */
{ SYF_MPSAFE | AS(svr4_sys_ulimit_args), (sy_call_t *)svr4_sys_ulimit }, /* 63 = svr4_sys_ulimit */
@@ -114,15 +114,15 @@
{ AS(svr4_sys_lstat_args), (sy_call_t *)svr4_sys_lstat }, /* 88 = svr4_sys_lstat */
{ AS(symlink_args), (sy_call_t *)symlink }, /* 89 = symlink */
{ AS(readlink_args), (sy_call_t *)readlink }, /* 90 = readlink */
- { AS(getgroups_args), (sy_call_t *)getgroups }, /* 91 = getgroups */
- { AS(setgroups_args), (sy_call_t *)setgroups }, /* 92 = setgroups */
+ { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups }, /* 91 = getgroups */
+ { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups }, /* 92 = setgroups */
{ AS(fchmod_args), (sy_call_t *)fchmod }, /* 93 = fchmod */
{ AS(fchown_args), (sy_call_t *)fchown }, /* 94 = fchown */
- { AS(svr4_sys_sigprocmask_args), (sy_call_t *)svr4_sys_sigprocmask }, /* 95 = svr4_sys_sigprocmask */
- { AS(svr4_sys_sigsuspend_args), (sy_call_t *)svr4_sys_sigsuspend }, /* 96 = svr4_sys_sigsuspend */
- { AS(svr4_sys_sigaltstack_args), (sy_call_t *)svr4_sys_sigaltstack }, /* 97 = svr4_sys_sigaltstack */
- { AS(svr4_sys_sigaction_args), (sy_call_t *)svr4_sys_sigaction }, /* 98 = svr4_sys_sigaction */
- { AS(svr4_sys_sigpending_args), (sy_call_t *)svr4_sys_sigpending }, /* 99 = svr4_sys_sigpending */
+ { SYF_MPSAFE | AS(svr4_sys_sigprocmask_args), (sy_call_t *)svr4_sys_sigprocmask }, /* 95 = svr4_sys_sigprocmask */
+ { SYF_MPSAFE | AS(svr4_sys_sigsuspend_args), (sy_call_t *)svr4_sys_sigsuspend }, /* 96 = svr4_sys_sigsuspend */
+ { SYF_MPSAFE | AS(svr4_sys_sigaltstack_args), (sy_call_t *)svr4_sys_sigaltstack }, /* 97 = svr4_sys_sigaltstack */
+ { SYF_MPSAFE | AS(svr4_sys_sigaction_args), (sy_call_t *)svr4_sys_sigaction }, /* 98 = svr4_sys_sigaction */
+ { SYF_MPSAFE | AS(svr4_sys_sigpending_args), (sy_call_t *)svr4_sys_sigpending }, /* 99 = svr4_sys_sigpending */
{ AS(svr4_sys_context_args), (sy_call_t *)svr4_sys_context }, /* 100 = svr4_sys_context */
{ 0, (sy_call_t *)nosys }, /* 101 = evsys */
{ 0, (sy_call_t *)nosys }, /* 102 = evtrapret */
@@ -139,8 +139,8 @@
{ AS(svr4_sys_pathconf_args), (sy_call_t *)svr4_sys_pathconf }, /* 113 = svr4_sys_pathconf */
{ 0, (sy_call_t *)nosys }, /* 114 = mincore */
{ AS(svr4_sys_mmap_args), (sy_call_t *)svr4_sys_mmap }, /* 115 = svr4_sys_mmap */
- { AS(mprotect_args), (sy_call_t *)mprotect }, /* 116 = mprotect */
- { AS(munmap_args), (sy_call_t *)munmap }, /* 117 = munmap */
+ { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect }, /* 116 = mprotect */
+ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap }, /* 117 = munmap */
{ AS(svr4_sys_fpathconf_args), (sy_call_t *)svr4_sys_fpathconf }, /* 118 = svr4_sys_fpathconf */
{ SYF_MPSAFE | 0, (sy_call_t *)vfork }, /* 119 = vfork */
{ AS(fchdir_args), (sy_call_t *)fchdir }, /* 120 = fchdir */
@@ -159,12 +159,12 @@
{ 0, (sy_call_t *)nosys }, /* 133 = putpmsg */
{ AS(rename_args), (sy_call_t *)rename }, /* 134 = rename */
{ AS(svr4_sys_uname_args), (sy_call_t *)svr4_sys_uname }, /* 135 = svr4_sys_uname */
- { AS(setegid_args), (sy_call_t *)setegid }, /* 136 = setegid */
+ { SYF_MPSAFE | AS(setegid_args), (sy_call_t *)setegid }, /* 136 = setegid */
{ AS(svr4_sys_sysconfig_args), (sy_call_t *)svr4_sys_sysconfig }, /* 137 = svr4_sys_sysconfig */
{ SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime }, /* 138 = adjtime */
{ AS(svr4_sys_systeminfo_args), (sy_call_t *)svr4_sys_systeminfo }, /* 139 = svr4_sys_systeminfo */
{ 0, (sy_call_t *)nosys }, /* 140 = notused */
- { AS(seteuid_args), (sy_call_t *)seteuid }, /* 141 = seteuid */
+ { SYF_MPSAFE | AS(seteuid_args), (sy_call_t *)seteuid }, /* 141 = seteuid */
{ 0, (sy_call_t *)nosys }, /* 142 = vtrace */
{ 0, (sy_call_t *)nosys }, /* 143 = { */
{ 0, (sy_call_t *)nosys }, /* 144 = sigtimedwait */
@@ -225,8 +225,8 @@
{ SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep }, /* 199 = nanosleep */
{ AS(svr4_sys_facl_args), (sy_call_t *)svr4_sys_facl }, /* 200 = svr4_sys_facl */
{ 0, (sy_call_t *)nosys }, /* 201 = door */
- { AS(setreuid_args), (sy_call_t *)setreuid }, /* 202 = setreuid */
- { AS(setregid_args), (sy_call_t *)setregid }, /* 203 = setregid */
+ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 202 = setreuid */
+ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 203 = setregid */
{ 0, (sy_call_t *)nosys }, /* 204 = install_utrap */
{ 0, (sy_call_t *)nosys }, /* 205 = signotify */
{ 0, (sy_call_t *)nosys }, /* 206 = schedctl */
==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#5 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.14 2004/02/04 21:57:00 jhb Exp $
+ $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp $
; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93
;
; System call name/number master file (or rather, slave, from SVR4).
@@ -36,10 +36,10 @@
0 UNIMPL unused
1 NOPROTO { void sys_exit(int rval); } exit sys_exit_args void
2 MNOPROTO { int fork(void); }
-3 NOPROTO { int read(int fd, char *buf, u_int nbyte); }
-4 NOPROTO { int write(int fd, char *buf, u_int nbyte); }
+3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); }
+4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); }
5 STD { int svr4_sys_open(char *path, int flags, int mode); }
-6 NOPROTO { int close(int fd); }
+6 MNOPROTO { int close(int fd); }
7 STD { int svr4_sys_wait(int *status); }
8 STD { int svr4_sys_creat(char *path, int mode); }
9 NOPROTO { int link(char *path, char *link); }
@@ -53,35 +53,35 @@
17 STD { int svr4_sys_break(caddr_t nsize); }
18 STD { int svr4_sys_stat(char* path, struct svr4_stat* ub); }
19 NOPROTO { int lseek(int filedes, off_t *offset, int whence); }
-20 NOPROTO { pid_t getpid(void); }
+20 MNOPROTO { pid_t getpid(void); }
21 UNIMPL old_mount
22 UNIMPL sysv_umount
-23 NOPROTO { int setuid(uid_t uid); }
-24 NOPROTO { uid_t getuid(void); }
+23 MNOPROTO { int setuid(uid_t uid); }
+24 MNOPROTO { uid_t getuid(void); }
25 UNIMPL stime
26 UNIMPL ptrace
27 STD { int svr4_sys_alarm(unsigned sec); }
28 STD { int svr4_sys_fstat(int fd, struct svr4_stat *sb); }
-29 STD { int svr4_sys_pause(void); }
+29 MSTD { int svr4_sys_pause(void); }
30 STD { int svr4_sys_utime(char *path, struct svr4_utimbuf *ubuf); }
31 UNIMPL stty
32 UNIMPL gtty
33 STD { int svr4_sys_access(char *path, int flags); }
-34 STD { int svr4_sys_nice(int prio); }
+34 MSTD { int svr4_sys_nice(int prio); }
35 UNIMPL statfs
36 NOPROTO { int sync(void); }
-37 STD { int svr4_sys_kill(int pid, int signum); }
+37 MSTD { int svr4_sys_kill(int pid, int signum); }
38 UNIMPL fstatfs
-39 STD { int svr4_sys_pgrpsys(int cmd, int pid, int pgid); }
+39 MSTD { int svr4_sys_pgrpsys(int cmd, int pid, int pgid); }
40 UNIMPL xenix
-41 NOPROTO { int dup(u_int fd); }
-42 NOPROTO { int pipe(void); }
+41 MNOPROTO { int dup(u_int fd); }
+42 MNOPROTO { int pipe(void); }
43 STD { int svr4_sys_times(struct tms *tp); }
44 UNIMPL profil
45 UNIMPL plock
-46 NOPROTO { int setgid(gid_t gid); }
-47 NOPROTO { gid_t getgid(void); }
-48 STD { int svr4_sys_signal(int signum, svr4_sig_t handler); }
+46 MNOPROTO { int setgid(gid_t gid); }
+47 MNOPROTO { gid_t getgid(void); }
+48 MSTD { int svr4_sys_signal(int signum, svr4_sig_t handler); }
#if defined(NOTYET)
49 STD { int svr4_sys_msgsys(int what, int a2, int a3, int a4, \
int a5); }
@@ -98,7 +98,7 @@
57 STD { int svr4_sys_utssys(void *a1, void *a2, int sel, void *a3); }
58 NOPROTO { int fsync(int fd); }
59 STD { int svr4_sys_execve(char *path, char **argp, char **envp); }
-60 NOPROTO { int umask(int newmask); }
+60 MNOPROTO { int umask(int newmask); }
61 NOPROTO { int chroot(char *path); }
62 STD { int svr4_sys_fcntl(int fd, int cmd, char *arg); }
63 MSTD { int svr4_sys_ulimit(int cmd, long newlimit); }
@@ -132,18 +132,18 @@
88 STD { int svr4_sys_lstat(char *path, struct svr4_stat *ub); }
89 NOPROTO { int symlink(char *path, char *link); }
90 NOPROTO { int readlink(char *path, char *buf, int count); }
-91 NOPROTO { int getgroups(u_int gidsetsize, gid_t *gidset); }
-92 NOPROTO { int setgroups(u_int gidsetsize, gid_t *gidset); }
+91 MNOPROTO { int getgroups(u_int gidsetsize, gid_t *gidset); }
+92 MNOPROTO { int setgroups(u_int gidsetsize, gid_t *gidset); }
93 NOPROTO { int fchmod(int fd, int mode); }
94 NOPROTO { int fchown(int fd, int uid, int gid); }
-95 STD { int svr4_sys_sigprocmask(int how, svr4_sigset_t *set, \
+95 MSTD { int svr4_sys_sigprocmask(int how, svr4_sigset_t *set, \
svr4_sigset_t *oset); }
-96 STD { int svr4_sys_sigsuspend(svr4_sigset_t *ss); }
-97 STD { int svr4_sys_sigaltstack(struct svr4_sigaltstack *nss, \
+96 MSTD { int svr4_sys_sigsuspend(svr4_sigset_t *ss); }
+97 MSTD { int svr4_sys_sigaltstack(struct svr4_sigaltstack *nss, \
struct svr4_sigaltstack *oss); }
-98 STD { int svr4_sys_sigaction(int signum, \
+98 MSTD { int svr4_sys_sigaction(int signum, \
struct svr4_sigaction *nsa, struct svr4_sigaction *osa); }
-99 STD { int svr4_sys_sigpending(int what, svr4_sigset_t *mask); }
+99 MSTD { int svr4_sys_sigpending(int what, svr4_sigset_t *mask); }
100 STD { int svr4_sys_context(int func, struct svr4_ucontext *uc); }
101 UNIMPL evsys
102 UNIMPL evtrapret
@@ -163,8 +163,8 @@
114 UNIMPL mincore
115 STD { caddr_t svr4_sys_mmap( caddr_t addr, svr4_size_t len, \
int prot, int flags, int fd, svr4_off_t pos); }
-116 NOPROTO { int mprotect(void *addr, int len, int prot); }
-117 NOPROTO { int munmap(void *addr, int len); }
+116 MNOPROTO { int mprotect(void *addr, int len, int prot); }
+117 MNOPROTO { int munmap(void *addr, int len); }
118 STD { int svr4_sys_fpathconf(int fd, int name); }
119 MNOPROTO { int vfork(void); }
120 NOPROTO { int fchdir(int fd); }
@@ -189,13 +189,13 @@
133 UNIMPL putpmsg
134 NOPROTO { int rename(char *from, char *to); }
135 STD { int svr4_sys_uname(struct svr4_utsname* name, int dummy); }
-136 NOPROTO { int setegid(gid_t egid); }
+136 MNOPROTO { int setegid(gid_t egid); }
137 STD { int svr4_sys_sysconfig(int name); }
138 MNOPROTO { int adjtime(struct timeval *delta, \
struct timeval *olddelta); }
139 STD { long svr4_sys_systeminfo(int what, char *buf, long len); }
140 UNIMPL notused
-141 NOPROTO { int seteuid(uid_t euid); }
+141 MNOPROTO { int seteuid(uid_t euid); }
142 UNIMPL vtrace
; fork1
143 MUNIMPL { int fork(void); }
@@ -265,8 +265,8 @@
200 STD { int svr4_sys_facl(int fd, int cmd, int num, \
struct svr4_aclent *buf); }
201 UNIMPL door
-202 NOPROTO { int setreuid(int ruid, int euid); }
-203 NOPROTO { int setregid(int rgid, int egid); }
+202 MNOPROTO { int setreuid(int ruid, int euid); }
+203 MNOPROTO { int setregid(int rgid, int egid); }
204 UNIMPL install_utrap
205 UNIMPL signotify
206 UNIMPL schedctl
==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#36 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.51 2004/01/26 19:29:04 jhb Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.52 2004/02/06 19:38:05 philip Exp $
*/
#include "bus_if.h"
@@ -120,12 +120,12 @@
#define ACPI_POWER 0x00040000
#define ACPI_EC 0x00080000
#define ACPI_AC_ADAPTER 0x00100000
-#define ACPI_BATTERY 0x00110000
-#define ACPI_BUTTON 0x00120000
-#define ACPI_PROCESSOR 0x00140000
-#define ACPI_THERMAL 0x00180000
-#define ACPI_FAN 0x00200000
-#define ACPI_TOSHIBA 0x00400000
+#define ACPI_BATTERY 0x00200000
+#define ACPI_BUTTON 0x00400000
+#define ACPI_PROCESSOR 0x00800000
+#define ACPI_THERMAL 0x01000000
+#define ACPI_FAN 0x02000000
+#define ACPI_TOSHIBA 0x04000000
/*
* Constants for different interrupt models used with acpi_SetIntrModel().
==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#6 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.17 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.16 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.18 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.17 2004/02/06 20:20:07 jhb Exp
*/
#ifndef _IBCS2_SYSPROTO_H_
==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#5 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.14 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.16 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.15 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.17 2004/02/06 20:20:07 jhb Exp
*/
#define IBCS2_SYS_syscall 0
==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#6 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.18 2004/02/04 22:00:42 jhb Exp $
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.16 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.19 2004/02/06 20:21:18 jhb Exp $
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.17 2004/02/06 20:20:07 jhb Exp
*/
#include <sys/param.h>
@@ -21,9 +21,9 @@
{ SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit }, /* 1 = exit */
{ SYF_MPSAFE | 0, (sy_call_t *)fork }, /* 2 = fork */
{ AS(ibcs2_read_args), (sy_call_t *)ibcs2_read }, /* 3 = ibcs2_read */
- { AS(write_args), (sy_call_t *)write }, /* 4 = write */
+ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */
{ AS(ibcs2_open_args), (sy_call_t *)ibcs2_open }, /* 5 = ibcs2_open */
- { AS(close_args), (sy_call_t *)close }, /* 6 = close */
+ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */
{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait }, /* 7 = ibcs2_wait */
{ AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat }, /* 8 = ibcs2_creat */
{ AS(link_args), (sy_call_t *)link }, /* 9 = link */
@@ -37,34 +37,34 @@
{ AS(obreak_args), (sy_call_t *)obreak }, /* 17 = obreak */
{ AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat }, /* 18 = ibcs2_stat */
{ AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek }, /* 19 = ibcs2_lseek */
- { 0, (sy_call_t *)getpid }, /* 20 = getpid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getpid }, /* 20 = getpid */
{ AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount }, /* 21 = ibcs2_mount */
{ AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount }, /* 22 = ibcs2_umount */
- { AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid }, /* 23 = ibcs2_setuid */
- { 0, (sy_call_t *)getuid }, /* 24 = getuid */
+ { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid }, /* 23 = ibcs2_setuid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getuid }, /* 24 = getuid */
{ AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime }, /* 25 = ibcs2_stime */
- { AS(ptrace_args), (sy_call_t *)ptrace }, /* 26 = ptrace */
+ { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace }, /* 26 = ptrace */
{ AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm }, /* 27 = ibcs2_alarm */
{ AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat }, /* 28 = ibcs2_fstat */
- { 0, (sy_call_t *)ibcs2_pause }, /* 29 = ibcs2_pause */
+ { SYF_MPSAFE | 0, (sy_call_t *)ibcs2_pause }, /* 29 = ibcs2_pause */
{ AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime }, /* 30 = ibcs2_utime */
{ AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty }, /* 31 = ibcs2_stty */
{ AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty }, /* 32 = ibcs2_gtty */
{ AS(ibcs2_access_args), (sy_call_t *)ibcs2_access }, /* 33 = ibcs2_access */
- { AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice }, /* 34 = ibcs2_nice */
+ { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice }, /* 34 = ibcs2_nice */
{ AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs }, /* 35 = ibcs2_statfs */
{ 0, (sy_call_t *)sync }, /* 36 = sync */
- { AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill }, /* 37 = ibcs2_kill */
+ { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill }, /* 37 = ibcs2_kill */
{ AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs }, /* 38 = ibcs2_fstatfs */
- { AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys }, /* 39 = ibcs2_pgrpsys */
+ { SYF_MPSAFE | AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys }, /* 39 = ibcs2_pgrpsys */
{ AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix }, /* 40 = ibcs2_xenix */
- { AS(dup_args), (sy_call_t *)dup }, /* 41 = dup */
- { 0, (sy_call_t *)pipe }, /* 42 = pipe */
+ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup }, /* 41 = dup */
+ { SYF_MPSAFE | 0, (sy_call_t *)pipe }, /* 42 = pipe */
{ AS(ibcs2_times_args), (sy_call_t *)ibcs2_times }, /* 43 = ibcs2_times */
{ SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil }, /* 44 = profil */
{ AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock }, /* 45 = ibcs2_plock */
- { AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid }, /* 46 = ibcs2_setgid */
- { 0, (sy_call_t *)getgid }, /* 47 = getgid */
+ { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid }, /* 46 = ibcs2_setgid */
+ { SYF_MPSAFE | 0, (sy_call_t *)getgid }, /* 47 = getgid */
{ AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys }, /* 48 = ibcs2_sigsys */
{ AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys }, /* 49 = ibcs2_msgsys */
{ AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86 }, /* 50 = ibcs2_sysi86 */
@@ -77,7 +77,7 @@
{ AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys }, /* 57 = ibcs2_utssys */
{ AS(fsync_args), (sy_call_t *)fsync }, /* 58 = fsync */
{ AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve }, /* 59 = ibcs2_execve */
- { AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */
+ { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */
{ AS(chroot_args), (sy_call_t *)chroot }, /* 61 = chroot */
{ AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl }, /* 62 = ibcs2_fcntl */
{ SYF_MPSAFE | AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit }, /* 63 = ibcs2_ulimit */
@@ -120,7 +120,7 @@
{ 0, (sy_call_t *)nosys }, /* 100 = nosys */
{ 0, (sy_call_t *)nosys }, /* 101 = nosys */
{ 0, (sy_call_t *)nosys }, /* 102 = nosys */
- { AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 103 = sigreturn */
+ { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 103 = sigreturn */
{ 0, (sy_call_t *)nosys }, /* 104 = nosys */
{ 0, (sy_call_t *)ibcs2_isc }, /* 105 = ibcs2_isc */
{ 0, (sy_call_t *)nosys }, /* 106 = nosys */
==== //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#5 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.16 2004/02/04 21:57:00 jhb Exp $
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.17 2004/02/06 20:20:07 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from IBCS2).
@@ -34,9 +34,9 @@
1 MNOPROTO { void sys_exit(int rval); } exit sys_exit_args void
2 MNOPROTO { int fork(void); }
3 STD { int ibcs2_read(int fd, char *buf, u_int nbytes); }
-4 NOPROTO { int write(int fd, char *buf, u_int nbytes); }
+4 MNOPROTO { int write(int fd, char *buf, u_int nbytes); }
5 STD { int ibcs2_open(char *path, int flags, int mode); }
-6 NOPROTO { int close(int fd); }
+6 MNOPROTO { int close(int fd); }
7 STD { int ibcs2_wait(int a1, int a2, int a3); }
8 STD { int ibcs2_creat(char *path, int mode); }
9 NOPROTO { int link(char *path, char *link); }
@@ -50,39 +50,39 @@
17 NOPROTO { int obreak(caddr_t nsize); }
18 STD { int ibcs2_stat(char* path, struct ibcs2_stat *st); }
19 STD { long ibcs2_lseek(int fd, long offset, int whence); }
-20 NOPROTO { pid_t getpid(void); }
+20 MNOPROTO { pid_t getpid(void); }
21 STD { int ibcs2_mount(char *special, char *dir, int flags, \
int fstype, char *data, int len); }
22 STD { int ibcs2_umount(char *name); }
-23 STD { int ibcs2_setuid(int uid); }
-24 NOPROTO { uid_t getuid(void); }
+23 MSTD { int ibcs2_setuid(int uid); }
+24 MNOPROTO { uid_t getuid(void); }
25 STD { int ibcs2_stime(long *timep); }
-26 NOPROTO { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
+26 MNOPROTO { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
27 STD { int ibcs2_alarm(unsigned sec); }
28 STD { int ibcs2_fstat(int fd, struct ibcs2_stat *st); }
-29 STD { int ibcs2_pause(void); }
+29 MSTD { int ibcs2_pause(void); }
30 STD { int ibcs2_utime(char *path, struct ibcs2_utimbuf *buf); }
31 STD { int ibcs2_stty(int fd, struct sgttyb *buf); }
32 STD { int ibcs2_gtty(int fd, struct sgttyb *buf); }
33 STD { int ibcs2_access(char *path, int flags); }
-34 STD { int ibcs2_nice(int incr); }
+34 MSTD { int ibcs2_nice(int incr); }
35 STD { int ibcs2_statfs(char *path, struct ibcs2_statfs *buf, \
int len, int fstype); }
36 NOPROTO { int sync(void); }
-37 STD { int ibcs2_kill(int pid, int signo); }
+37 MSTD { int ibcs2_kill(int pid, int signo); }
38 STD { int ibcs2_fstatfs(int fd, struct ibcs2_statfs *buf, \
int len, int fstype); }
-39 STD { int ibcs2_pgrpsys(int type, caddr_t dummy, int pid, \
+39 MSTD { int ibcs2_pgrpsys(int type, caddr_t dummy, int pid, \
int pgid); }
40 STD { int ibcs2_xenix(int a1, int a2, int a3, int a4, int a5); }
-41 NOPROTO { int dup(u_int fd); }
-42 NOPROTO { int pipe(void); }
+41 MNOPROTO { int dup(u_int fd); }
+42 MNOPROTO { int pipe(void); }
43 STD { int ibcs2_times(struct tms *tp); }
44 MNOPROTO { int profil(caddr_t samples, u_int size, u_int offset, \
u_int scale); }
45 STD { int ibcs2_plock(int cmd); }
-46 STD { int ibcs2_setgid(int gid); }
-47 NOPROTO { gid_t getgid(void); }
+46 MSTD { int ibcs2_setgid(int gid); }
+47 MNOPROTO { gid_t getgid(void); }
48 STD { int ibcs2_sigsys(int sig, ibcs2_sig_t fp); }
49 STD { int ibcs2_msgsys(int which, int a2, int a3, int a4, int a5, \
int a6); }
@@ -96,7 +96,7 @@
57 STD { int ibcs2_utssys(int a1, int a2, int flag); }
58 NOPROTO { int fsync(int fd); }
59 STD { int ibcs2_execve(char *path, char **argp, char **envp); }
-60 NOPROTO { int umask(int newmask); }
+60 MNOPROTO { int umask(int newmask); }
61 NOPROTO { int chroot(char *path); }
62 STD { int ibcs2_fcntl(int fd, int cmd, char *arg); }
63 MSTD { long ibcs2_ulimit(int cmd, int newlimit); }
@@ -143,7 +143,7 @@
100 UNIMPL nosys
101 UNIMPL nosys
102 UNIMPL nosys
-103 NOPROTO { int sigreturn(struct sigcontext *sigcntxp); }
+103 MNOPROTO { int sigreturn(struct sigcontext *sigcntxp); }
104 UNIMPL nosys
105 STD { int ibcs2_isc(void); }
106 UNIMPL nosys
==== //depot/projects/smpng/sys/kern/kern_resource.c#43 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.132 2004/02/06 19:30:12 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.133 2004/02/06 19:35:14 jhb Exp $");
#include "opt_compat.h"
@@ -837,9 +837,9 @@
struct plimit *limp;
limp = (struct plimit *)malloc(sizeof(struct plimit), M_PLIMIT,
- M_WAITOK | M_ZERO);
+ M_WAITOK);
limp->pl_refcnt = 1;
- mtx_init(&limp->pl_mtx, "plimit lock", NULL, MTX_DEF);
+ limp->pl_mtx = mtx_pool_alloc(mtxpool_sleep);
return (limp);
}
@@ -862,7 +862,7 @@
LIM_LOCK(limp);
KASSERT(limp->pl_refcnt > 0, ("plimit refcnt underflow"));
if (--limp->pl_refcnt == 0) {
- mtx_destroy(&limp->pl_mtx);
+ LIM_UNLOCK(limp);
free((void *)limp, M_PLIMIT);
return;
}
==== //depot/projects/smpng/sys/sys/resourcevar.h#17 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)resourcevar.h 8.4 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/resourcevar.h,v 1.39 2004/02/06 19:25:34 jhb Exp $
+ * $FreeBSD: src/sys/sys/resourcevar.h,v 1.40 2004/02/06 19:35:14 jhb Exp $
*/
#ifndef _SYS_RESOURCEVAR_H_
@@ -68,6 +68,8 @@
struct timeval p_start; /* starting time */
};
+#ifdef _KERNEL
+
/*
* Kernel shareable process resource limits. Because this structure
* is moderately large but changes infrequently, it is normally
@@ -76,20 +78,12 @@
struct plimit {
struct rlimit pl_rlimit[RLIM_NLIMITS];
int pl_refcnt; /* number of references */
- struct mtx pl_mtx;
+ struct mtx *pl_mtx;
};
-#ifdef _KERNEL
-
-/*
- * Lock order for operations involving the plimit lock:
- * filedesc <important to avoid deadlocks in the descriptor code>
- * proc
- * plimit
- */
-#define LIM_LOCK(lim) mtx_lock(&(lim)->pl_mtx)
-#define LIM_UNLOCK(lim) mtx_unlock(&(lim)->pl_mtx)
-#define LIM_LOCK_ASSERT(lim, f) mtx_assert(&(lim)->pl_mtx, (f))
+#define LIM_LOCK(lim) mtx_lock((lim)->pl_mtx)
+#define LIM_UNLOCK(lim) mtx_unlock((lim)->pl_mtx)
+#define LIM_LOCK_ASSERT(lim, f) mtx_assert((lim)->pl_mtx, (f))
/*
* Per uid resource consumption
More information about the p4-projects
mailing list