From c1826f5b61e1590232452fec2b9435e4dfaefe6a Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Mon, 11 Mar 2019 11:40:29 +0900 Subject: [PATCH] Revert "mm/migrate: Pass vm_fault pointer to migrate_misplaced_page()" This reverts commit b7efa36bf548cec5875e9caf56a24f59685deff4. Bug: 128240262 Change-Id: I21a63bb3e600beb422a8fc5240a4c3bed611fadc Signed-off-by: Minchan Kim [dereference23: Forward port to msm-5.4] Signed-off-by: Alexander Winkowski --- include/linux/migrate.h | 4 ++-- mm/memory.c | 2 +- mm/migrate.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index dff5b45f0e0e..400e635e4272 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -131,14 +131,14 @@ static inline void __ClearPageMovable(struct page *page) #ifdef CONFIG_NUMA_BALANCING extern bool pmd_trans_migrating(pmd_t pmd); extern int migrate_misplaced_page(struct page *page, - struct vm_fault *vmf, int node); + struct vm_area_struct *vma, int node); #else static inline bool pmd_trans_migrating(pmd_t pmd) { return false; } static inline int migrate_misplaced_page(struct page *page, - struct vm_fault *vmf, int node) + struct vm_area_struct *vma, int node) { return -EAGAIN; /* can't migrate now */ } diff --git a/mm/memory.c b/mm/memory.c index daf44ceb4409..b7e6cc034b08 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4001,7 +4001,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) } /* Migrate to the requested node */ - migrated = migrate_misplaced_page(page, vmf, target_nid); + migrated = migrate_misplaced_page(page, vma, target_nid); if (migrated) { page_nid = target_nid; flags |= TNF_MIGRATED; diff --git a/mm/migrate.c b/mm/migrate.c index 9a6bdbceec00..645599558446 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1976,7 +1976,7 @@ bool pmd_trans_migrating(pmd_t pmd) * node. Caller is expected to have an elevated reference count on * the page that will be dropped by this function before returning. */ -int migrate_misplaced_page(struct page *page, struct vm_fault *vmf, +int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, int node) { pg_data_t *pgdat = NODE_DATA(node); @@ -1989,7 +1989,7 @@ int migrate_misplaced_page(struct page *page, struct vm_fault *vmf, * with execute permissions as they are probably shared libraries. */ if (page_mapcount(page) != 1 && page_is_file_cache(page) && - (vmf->vma_flags & VM_EXEC)) + (vma->vm_flags & VM_EXEC)) goto out; /*