aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/internal.h12
-rw-r--r--mm/migrate.c4
2 files changed, 2 insertions, 14 deletions
diff --git a/mm/internal.h b/mm/internal.h
index a4b927cdca09..4fe67a162cb4 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -63,18 +63,6 @@ static inline unsigned long page_order(struct page *page)
63 return page_private(page); 63 return page_private(page);
64} 64}
65 65
66/*
67 * unevictable_migrate_page() called only from migrate_page_copy() to
68 * migrate unevictable flag to new page.
69 * Note that the old page has been isolated from the LRU lists at this
70 * point so we don't need to worry about LRU statistics.
71 */
72static inline void unevictable_migrate_page(struct page *new, struct page *old)
73{
74 if (TestClearPageUnevictable(old))
75 SetPageUnevictable(new);
76}
77
78#ifdef CONFIG_MMU 66#ifdef CONFIG_MMU
79extern long mlock_vma_pages_range(struct vm_area_struct *vma, 67extern long mlock_vma_pages_range(struct vm_area_struct *vma,
80 unsigned long start, unsigned long end); 68 unsigned long start, unsigned long end);
diff --git a/mm/migrate.c b/mm/migrate.c
index 2a0ea3ef509e..efddbf0926b2 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -288,8 +288,8 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
288 if (TestClearPageActive(page)) { 288 if (TestClearPageActive(page)) {
289 VM_BUG_ON(PageUnevictable(page)); 289 VM_BUG_ON(PageUnevictable(page));
290 SetPageActive(newpage); 290 SetPageActive(newpage);
291 } else 291 } else if (TestClearPageUnevictable(page))
292 unevictable_migrate_page(newpage, page); 292 SetPageUnevictable(newpage);
293 if (PageChecked(page)) 293 if (PageChecked(page))
294 SetPageChecked(newpage); 294 SetPageChecked(newpage);
295 if (PageMappedToDisk(page)) 295 if (PageMappedToDisk(page))