diff options
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 880bd592d38e..88000b89fc9a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -134,7 +134,7 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, | |||
134 | page_add_file_rmap(new); | 134 | page_add_file_rmap(new); |
135 | 135 | ||
136 | /* No need to invalidate - it was non-present before */ | 136 | /* No need to invalidate - it was non-present before */ |
137 | update_mmu_cache(vma, addr, pte); | 137 | update_mmu_cache(vma, addr, ptep); |
138 | unlock: | 138 | unlock: |
139 | pte_unmap_unlock(ptep, ptl); | 139 | pte_unmap_unlock(ptep, ptl); |
140 | out: | 140 | out: |
@@ -275,8 +275,6 @@ static int migrate_page_move_mapping(struct address_space *mapping, | |||
275 | */ | 275 | */ |
276 | static void migrate_page_copy(struct page *newpage, struct page *page) | 276 | static void migrate_page_copy(struct page *newpage, struct page *page) |
277 | { | 277 | { |
278 | int anon; | ||
279 | |||
280 | copy_highpage(newpage, page); | 278 | copy_highpage(newpage, page); |
281 | 279 | ||
282 | if (PageError(page)) | 280 | if (PageError(page)) |
@@ -313,8 +311,6 @@ static void migrate_page_copy(struct page *newpage, struct page *page) | |||
313 | ClearPageSwapCache(page); | 311 | ClearPageSwapCache(page); |
314 | ClearPagePrivate(page); | 312 | ClearPagePrivate(page); |
315 | set_page_private(page, 0); | 313 | set_page_private(page, 0); |
316 | /* page->mapping contains a flag for PageAnon() */ | ||
317 | anon = PageAnon(page); | ||
318 | page->mapping = NULL; | 314 | page->mapping = NULL; |
319 | 315 | ||
320 | /* | 316 | /* |