diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 11:22:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 11:22:16 -0400 |
| commit | b5869ce7f68b233ceb81465a7644be0d9a5f3dbb (patch) | |
| tree | e3611e7f038a4a4fa813532ae57a9a626fa1434d /net | |
| parent | df3d80f5a5c74168be42788364d13cf6c83c7b9c (diff) | |
| parent | 9c63d9c021f375a2708ad79043d6f4dd1291a085 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: (140 commits)
sched: sync wakeups preempt too
sched: affine sync wakeups
sched: guest CPU accounting: maintain guest state in KVM
sched: guest CPU accounting: maintain stats in account_system_time()
sched: guest CPU accounting: add guest-CPU /proc/<pid>/stat fields
sched: guest CPU accounting: add guest-CPU /proc/stat field
sched: domain sysctl fixes: add terminator comment
sched: domain sysctl fixes: do not crash on allocation failure
sched: domain sysctl fixes: unregister the sysctl table before domains
sched: domain sysctl fixes: use for_each_online_cpu()
sched: domain sysctl fixes: use kcalloc()
Make scheduler debug file operations const
sched: enable wake-idle on CONFIG_SCHED_MC=y
sched: reintroduce topology.h tunings
sched: allow the immediate migration of cache-cold tasks
sched: debug, improve migration statistics
sched: debug: increase width of debug line
sched: activate task_hot() only on fair-scheduled tasks
sched: reintroduce cache-hot affinity
sched: speed up context-switches a bit
...
Diffstat (limited to 'net')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 2b57eaf66abc..6996cba5aa96 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -334,7 +334,7 @@ static void unix_write_space(struct sock *sk) | |||
| 334 | read_lock(&sk->sk_callback_lock); | 334 | read_lock(&sk->sk_callback_lock); |
| 335 | if (unix_writable(sk)) { | 335 | if (unix_writable(sk)) { |
| 336 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 336 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) |
| 337 | wake_up_interruptible(sk->sk_sleep); | 337 | wake_up_interruptible_sync(sk->sk_sleep); |
| 338 | sk_wake_async(sk, 2, POLL_OUT); | 338 | sk_wake_async(sk, 2, POLL_OUT); |
| 339 | } | 339 | } |
| 340 | read_unlock(&sk->sk_callback_lock); | 340 | read_unlock(&sk->sk_callback_lock); |
| @@ -1639,7 +1639,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1639 | if (!skb) | 1639 | if (!skb) |
| 1640 | goto out_unlock; | 1640 | goto out_unlock; |
| 1641 | 1641 | ||
| 1642 | wake_up_interruptible(&u->peer_wait); | 1642 | wake_up_interruptible_sync(&u->peer_wait); |
| 1643 | 1643 | ||
| 1644 | if (msg->msg_name) | 1644 | if (msg->msg_name) |
| 1645 | unix_copy_addr(msg, skb->sk); | 1645 | unix_copy_addr(msg, skb->sk); |