diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /ipc/util.c | |
parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'ipc/util.c')
-rw-r--r-- | ipc/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/util.c b/ipc/util.c index 42479e4eec59..cd8bb14a431f 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -301,7 +301,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize) | |||
301 | */ | 301 | */ |
302 | rcu_assign_pointer(ids->entries, new); | 302 | rcu_assign_pointer(ids->entries, new); |
303 | 303 | ||
304 | ipc_rcu_putref(old); | 304 | __ipc_fini_ids(ids, old); |
305 | return newsize; | 305 | return newsize; |
306 | } | 306 | } |
307 | 307 | ||