diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
| commit | 890ca861f868a10617029ffc87eae7d48ea6876c (patch) | |
| tree | 713383f4e3bbd94ddb9816a25e6b3911511908f1 /net/unix | |
| parent | 03452d27c6cd9cebb59a6bb0fb6bd8557916c263 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/garbage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 9bc73f87f64a..99f7012b23b9 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
| @@ -258,7 +258,7 @@ static void inc_inflight_move_tail(struct unix_sock *u) | |||
| 258 | list_move_tail(&u->link, &gc_candidates); | 258 | list_move_tail(&u->link, &gc_candidates); |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | static bool gc_in_progress = false; | 261 | static bool gc_in_progress; |
| 262 | #define UNIX_INFLIGHT_TRIGGER_GC 16000 | 262 | #define UNIX_INFLIGHT_TRIGGER_GC 16000 |
| 263 | 263 | ||
| 264 | void wait_for_unix_gc(void) | 264 | void wait_for_unix_gc(void) |