From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
a.p.zijlstra@chello.nl, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:numa/core] sched/numa/mm: Further clean up migrate_misplaced_page()
Date: Thu, 18 Oct 2012 10:07:35 -0700 [thread overview]
Message-ID: <tip-45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d@git.kernel.org> (raw)
Commit-ID: 45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d
Gitweb: http://git.kernel.org/tip/45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Mon, 15 Oct 2012 11:10:38 +0200
Committer: Ingo Molnar <mingo@kernel.org>
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 <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-rwqEijuwdsgpooxrce9kniG8@git.kernel.org
---
include/linux/migrate.h | 4 ++--
mm/memory.c | 2 +-
mm/migrate.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 7544d1a..9a5afea 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -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 */
}
diff --git a/mm/memory.c b/mm/memory.c
index 8b1ad86..fc48fe8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -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;
}
diff --git a/mm/migrate.c b/mm/migrate.c
index e3cff03..72d1056 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -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);
reply other threads:[~2012-10-18 17:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-45e23a2f98bf5ca9552ce50f7ce590f999c2ce0d@git.kernel.org \
--to=mingo@elte.hu \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox