Skip to contentSkip to conversation

sched/numa/mm: Further clean up migrate_misplaced_page()

tip:numa/core tip-bot for Ingo Molnar 1 participant 1 message Oct 18, 2012

Subsystems (3)
Memory management MM core MM migration
lore
Share & tools
lore

tip-bot for Ingo Molnar

author
#0 lore raw
Commit-ID:  45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d
Gitweb:     http://git.kernel.org/tip/45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d
Author:     Ingo Molnar <[email protected]>
AuthorDate: Mon, 15 Oct 2012 11:10:38 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 16 Oct 2012 10:04:41 +0200

sched/numa/mm: Further clean up migrate_misplaced_page()

The 'mm' parameter is not used anymore, get rid of it.

Signed-off-by Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
---
 include/linux/migrate.h |    4 ++--
 mm/memory.c             |    2 +-
 mm/migrate.c            |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/migrate.h +2 -2
index 7544d1a..9a5afea 100644
@@ -30,7 +30,7 @@ extern int migrate_vmas(struct mm_struct *mm,
 extern void migrate_page_copy(struct page *newpage, struct page *page);
 extern int migrate_huge_page_move_mapping(struct address_space *mapping,
 				  struct page *newpage, struct page *page);
-extern int migrate_misplaced_page(struct mm_struct *, struct page *, int);
+extern int migrate_misplaced_page(struct page *page, int node);
 #else
 
 static inline void putback_lru_pages(struct list_head *l) {}

@@ -65,7 +65,7 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
 #define fail_migrate_page NULL
 
 static inline
-int migrate_misplaced_page(struct mm_struct *mm, struct page *page, int node)
+int migrate_misplaced_page(struct page *page, int node)
 {
 	return -EAGAIN; /* can't migrate now */
 }
mm/memory.c +1 -1
index 8b1ad86..fc48fe8 100644
@@ -3486,7 +3486,7 @@ out:
 migrate:
 	pte_unmap_unlock(ptep, ptl);
 
-	if (!migrate_misplaced_page(mm, page, node)) {
+	if (!migrate_misplaced_page(page, node)) {
 		page_nid = node;
 		goto out;
 	}
mm/migrate.c +1 -1
index e3cff03..72d1056 100644
@@ -1418,7 +1418,7 @@ int migrate_vmas(struct mm_struct *mm, const nodemask_t *to,
  * Attempt to migrate a misplaced page to the specified destination
  * node.
  */
-int migrate_misplaced_page(struct mm_struct *mm, struct page *page, int node)
+int migrate_misplaced_page(struct page *page, int node)
 {
 	struct address_space *mapping = page_mapping(page);
 	int page_lru = page_is_file_cache(page);