aboutsummaryrefslogtreecommitdiffstats
path: root/mm/backing-dev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 12:23:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 12:23:07 -0400
commit3a3527b6461b1298cc53ce72f336346739297ac8 (patch)
tree30bea5dd7163f13d6c962888feaf53f50ead4cce /mm/backing-dev.c
parentcc77b4db0017dab014ad7ea3d297e10f5b5bf028 (diff)
parenta53f4b61a76a7e95139b8e8abba02e9bfe87a58a (diff)
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "net: Make accesses to ->br_port safe for sparse RCU" mce: convert to rcu_dereference_index_check() net: Make accesses to ->br_port safe for sparse RCU vfs: add fs.h to define struct file lockdep: Add an in_workqueue_context() lockdep-based test function rcu: add __rcu API for later sparse checking rcu: add an rcu_dereference_index_check() tree/tiny rcu: Add debug RCU head objects mm: remove all rcu head initializations fs: remove all rcu head initializations, except on_stack initializations powerpc: remove all rcu head initializations
Diffstat (limited to 'mm/backing-dev.c')
-rw-r--r--mm/backing-dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 123bcef13e51..f9fd3dd3916b 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -665,7 +665,6 @@ int bdi_init(struct backing_dev_info *bdi)
665 bdi->max_ratio = 100; 665 bdi->max_ratio = 100;
666 bdi->max_prop_frac = PROP_FRAC_BASE; 666 bdi->max_prop_frac = PROP_FRAC_BASE;
667 spin_lock_init(&bdi->wb_lock); 667 spin_lock_init(&bdi->wb_lock);
668 INIT_RCU_HEAD(&bdi->rcu_head);
669 INIT_LIST_HEAD(&bdi->bdi_list); 668 INIT_LIST_HEAD(&bdi->bdi_list);
670 INIT_LIST_HEAD(&bdi->wb_list); 669 INIT_LIST_HEAD(&bdi->wb_list);
671 INIT_LIST_HEAD(&bdi->work_list); 670 INIT_LIST_HEAD(&bdi->work_list);