diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-17 13:56:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-17 13:56:55 +1000 |
| commit | 3b67f955f0f04fda9ab72eb58b575ba7148447f0 (patch) | |
| tree | 9ce0acb9f80b887cb9d2f9ebab0d37419d268a75 /mm/migrate.c | |
| parent | ef14dfb872cac2b33ff451568313dcd504a32e4c (diff) | |
| parent | f2614fec1f83c409bc352206f28e6c5acbaa0991 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 27ed22579fd9..0f348946e288 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -165,7 +165,7 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, pte = arch_make_huge_pte(pte, vma, new, 0); } #endif - flush_cache_page(vma, addr, pte_pfn(pte)); + flush_dcache_page(new); set_pte_at(mm, addr, ptep, pte); if (PageHuge(new)) { @@ -876,6 +876,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, dec_zone_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); balloon_page_free(page); + balloon_event_count(COMPACTBALLOONMIGRATED); return MIGRATEPAGE_SUCCESS; } out: |