diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-09-28 07:03:03 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-09-28 07:03:03 +0000 |
| commit | 2b01dbdaa07af097e72d1ab008447ee1f3b6bd9b (patch) | |
| tree | 1db6d3398cfd694fad4465d775adf0700c4ab355 /sys/compat/svr4/svr4_ipc.c | |
| parent | f47ed80aec8394ebed798d91b1c91773c2139312 (diff) | |
| download | FreeBSD-src-2b01dbdaa07af097e72d1ab008447ee1f3b6bd9b.zip FreeBSD-src-2b01dbdaa07af097e72d1ab008447ee1f3b6bd9b.tar.gz | |
Back out alpha/alpha/trap.c:1.124, osf1_ioctl.c:1.14, osf1_misc.c:1.57,
osf1_signal.c:1.41, amd64/amd64/trap.c:1.291, linux_socket.c:1.60,
svr4_fcntl.c:1.36, svr4_ioctl.c:1.23, svr4_ipc.c:1.18, svr4_misc.c:1.81,
svr4_signal.c:1.34, svr4_stat.c:1.21, svr4_stream.c:1.55,
svr4_termios.c:1.13, svr4_ttold.c:1.15, svr4_util.h:1.10,
ext2_alloc.c:1.43, i386/i386/trap.c:1.279, vm86.c:1.58,
unaligned.c:1.12, imgact_elf.c:1.164, ffs_alloc.c:1.133:
Now that Giant is acquired in uprintf() and tprintf(), the caller no
longer leads to acquire Giant unless it also holds another mutex that
would generate a lock order reversal when calling into these functions.
Specifically not backed out is the acquisition of Giant in nfs_socket.c
and rpcclnt.c, where local mutexes are held and would otherwise violate
the lock order with Giant.
This aligns this code more with the eventual locking of ttys.
Suggested by: bde
Diffstat (limited to 'sys/compat/svr4/svr4_ipc.c')
| -rw-r--r-- | sys/compat/svr4/svr4_ipc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index 976668c..0b6acbf 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -77,9 +77,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/ipc.h> -#include <sys/lock.h> #include <sys/msg.h> -#include <sys/mutex.h> #include <sys/proc.h> #include <sys/sem.h> #include <sys/shm.h> |
