From 62fa5f23d72ee24979f36e2da96b53473bf2c1e6 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Mon, 10 May 2010 17:14:24 -0700 Subject: [PATCH] --- yaml --- r: 205218 b: refs/heads/master c: 875352c94224c88f5aa28cb77206f993bd31b7a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/backing-dev.c | 1 - trunk/mm/slob.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index deede705ceee..2b5577ab1d83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b97181f24212f4c29197890ce1b2b9100bcc184d +refs/heads/master: 875352c94224c88f5aa28cb77206f993bd31b7a2 diff --git a/trunk/mm/backing-dev.c b/trunk/mm/backing-dev.c index 660a87a22511..42f6d20358ad 100644 --- a/trunk/mm/backing-dev.c +++ b/trunk/mm/backing-dev.c @@ -668,7 +668,6 @@ int bdi_init(struct backing_dev_info *bdi) bdi->max_ratio = 100; bdi->max_prop_frac = PROP_FRAC_BASE; spin_lock_init(&bdi->wb_lock); - INIT_RCU_HEAD(&bdi->rcu_head); INIT_LIST_HEAD(&bdi->bdi_list); INIT_LIST_HEAD(&bdi->wb_list); INIT_LIST_HEAD(&bdi->work_list); diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 23631e2bb57a..19d2e5d46724 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -639,7 +639,6 @@ void kmem_cache_free(struct kmem_cache *c, void *b) if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) { struct slob_rcu *slob_rcu; slob_rcu = b + (c->size - sizeof(struct slob_rcu)); - INIT_RCU_HEAD(&slob_rcu->head); slob_rcu->size = c->size; call_rcu(&slob_rcu->head, kmem_rcu_free); } else {