diff options
Diffstat (limited to 'mm/backing-dev.c')
-rw-r--r-- | mm/backing-dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 7d63d5e9d3de..0ae0df55000b 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
@@ -443,7 +443,7 @@ int bdi_init(struct backing_dev_info *bdi) | |||
443 | bdi_wb_init(&bdi->wb, bdi); | 443 | bdi_wb_init(&bdi->wb, bdi); |
444 | 444 | ||
445 | for (i = 0; i < NR_BDI_STAT_ITEMS; i++) { | 445 | for (i = 0; i < NR_BDI_STAT_ITEMS; i++) { |
446 | err = percpu_counter_init(&bdi->bdi_stat[i], 0); | 446 | err = percpu_counter_init(&bdi->bdi_stat[i], 0, GFP_KERNEL); |
447 | if (err) | 447 | if (err) |
448 | goto err; | 448 | goto err; |
449 | } | 449 | } |
@@ -458,7 +458,7 @@ int bdi_init(struct backing_dev_info *bdi) | |||
458 | bdi->write_bandwidth = INIT_BW; | 458 | bdi->write_bandwidth = INIT_BW; |
459 | bdi->avg_write_bandwidth = INIT_BW; | 459 | bdi->avg_write_bandwidth = INIT_BW; |
460 | 460 | ||
461 | err = fprop_local_init_percpu(&bdi->completions); | 461 | err = fprop_local_init_percpu(&bdi->completions, GFP_KERNEL); |
462 | 462 | ||
463 | if (err) { | 463 | if (err) { |
464 | err: | 464 | err: |
@@ -623,7 +623,7 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout) | |||
623 | * of sleeping on the congestion queue | 623 | * of sleeping on the congestion queue |
624 | */ | 624 | */ |
625 | if (atomic_read(&nr_bdi_congested[sync]) == 0 || | 625 | if (atomic_read(&nr_bdi_congested[sync]) == 0 || |
626 | !zone_is_reclaim_congested(zone)) { | 626 | !test_bit(ZONE_CONGESTED, &zone->flags)) { |
627 | cond_resched(); | 627 | cond_resched(); |
628 | 628 | ||
629 | /* In case we scheduled, work out time remaining */ | 629 | /* In case we scheduled, work out time remaining */ |