diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /mm/backing-dev.c | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'mm/backing-dev.c')
| -rw-r--r-- | mm/backing-dev.c | 1 |
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); |