diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/backing-dev.c | 2 | ||||
-rw-r--r-- | mm/filemap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 09d9591b7708..1706cbbdf5f0 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
@@ -557,7 +557,7 @@ void clear_bdi_congested(struct backing_dev_info *bdi, int sync) | |||
557 | bit = sync ? BDI_sync_congested : BDI_async_congested; | 557 | bit = sync ? BDI_sync_congested : BDI_async_congested; |
558 | if (test_and_clear_bit(bit, &bdi->state)) | 558 | if (test_and_clear_bit(bit, &bdi->state)) |
559 | atomic_dec(&nr_bdi_congested[sync]); | 559 | atomic_dec(&nr_bdi_congested[sync]); |
560 | smp_mb__after_clear_bit(); | 560 | smp_mb__after_atomic(); |
561 | if (waitqueue_active(wqh)) | 561 | if (waitqueue_active(wqh)) |
562 | wake_up(wqh); | 562 | wake_up(wqh); |
563 | } | 563 | } |
diff --git a/mm/filemap.c b/mm/filemap.c index 088358c8006b..021056c324e6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -742,7 +742,7 @@ void unlock_page(struct page *page) | |||
742 | { | 742 | { |
743 | VM_BUG_ON_PAGE(!PageLocked(page), page); | 743 | VM_BUG_ON_PAGE(!PageLocked(page), page); |
744 | clear_bit_unlock(PG_locked, &page->flags); | 744 | clear_bit_unlock(PG_locked, &page->flags); |
745 | smp_mb__after_clear_bit(); | 745 | smp_mb__after_atomic(); |
746 | wake_up_page(page, PG_locked); | 746 | wake_up_page(page, PG_locked); |
747 | } | 747 | } |
748 | EXPORT_SYMBOL(unlock_page); | 748 | EXPORT_SYMBOL(unlock_page); |
@@ -759,7 +759,7 @@ void end_page_writeback(struct page *page) | |||
759 | if (!test_clear_page_writeback(page)) | 759 | if (!test_clear_page_writeback(page)) |
760 | BUG(); | 760 | BUG(); |
761 | 761 | ||
762 | smp_mb__after_clear_bit(); | 762 | smp_mb__after_atomic(); |
763 | wake_up_page(page, PG_writeback); | 763 | wake_up_page(page, PG_writeback); |
764 | } | 764 | } |
765 | EXPORT_SYMBOL(end_page_writeback); | 765 | EXPORT_SYMBOL(end_page_writeback); |