summaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-27 12:52:29 +0100
committerTakashi Iwai <tiwai@suse.de>2014-10-27 12:52:29 +0100
commitd5432503bfb49f3425bad0b850714ffd8b533cfc (patch)
tree97926e7eea0b6d8b0e8bf98748dd9c0ef4c718ad /net/unix
parent6a98e34b58919c52e8c8beec991759999af342da (diff)
parentc0d018bd5b1aabad59dffdec568e189359d93a14 (diff)
Merge tag 'asoc-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18 A few small driver fixes for v3.18 plus the removal of the s6000 support since the relevant chip is no longer supported in mainline.
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/garbage.c2
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)
list_move_tail(&u->link, &gc_candidates);
}
-static bool gc_in_progress = false;
+static bool gc_in_progress;
#define UNIX_INFLIGHT_TRIGGER_GC 16000
void wait_for_unix_gc(void)