diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /include/net/af_unix.h | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
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) |