diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
| commit | 45b86a96f17cb2900f291129b0e67287400e45b2 (patch) | |
| tree | f7968bf36e3947ee42251f7eebc6ea5f24aca202 /include/net/af_unix.h | |
| parent | 072ba49838b42c873c496d72c91bb237914cf3b6 (diff) | |
| parent | 4143c5cb36331155a1823af8b3a8c761a59fed71 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 7dd29b7e461d..c29ff1da8a18 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
| @@ -54,6 +54,7 @@ struct unix_sock { | |||
| 54 | atomic_long_t inflight; | 54 | atomic_long_t inflight; |
| 55 | spinlock_t lock; | 55 | spinlock_t lock; |
| 56 | unsigned int gc_candidate : 1; | 56 | unsigned int gc_candidate : 1; |
| 57 | unsigned int gc_maybe_cycle : 1; | ||
| 57 | wait_queue_head_t peer_wait; | 58 | wait_queue_head_t peer_wait; |
| 58 | }; | 59 | }; |
| 59 | #define unix_sk(__sk) ((struct unix_sock *)__sk) | 60 | #define unix_sk(__sk) ((struct unix_sock *)__sk) |