From: tip-bot for Stephen Rothwell <sfr@canb.auug.org.au>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
akpm@linux-foundation.org, peterz@infradead.org,
sfr@canb.auug.org.au, tglx@linutronix.de
Subject: [tip:numa/core] mm/migrate: Fix update_mmu_cache_pmd() use
Date: Thu, 13 Dec 2012 00:36:54 -0800 [thread overview]
Message-ID: <tip-8df383108f7b7eafcf89f26be5460b404c70ff29@git.kernel.org> (raw)
In-Reply-To: <20121210195402.1042a8ea5bfb57bb758007ac@canb.auug.org.au>
Commit-ID: 8df383108f7b7eafcf89f26be5460b404c70ff29
Gitweb: http://git.kernel.org/tip/8df383108f7b7eafcf89f26be5460b404c70ff29
Author: Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate: Mon, 10 Dec 2012 19:54:02 +1100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 10 Dec 2012 13:37:30 +0100
mm/migrate: Fix update_mmu_cache_pmd() use
Stephen Rothwell reported this linux-next build failure:
mm/migrate.c: In function 'migrate_misplaced_transhuge_page_put':
mm/migrate.c:1666:2: error: incompatible type for argument 3 of 'update_mmu_cache_pmd'
Caused by commit 7f7f03ce3820 ("mm, numa: Implement
migrate-on-fault lazy NUMA strategy for regular and THP pages")
from the tip tree and exposed by commit "x86: convert
update_mmu_cache() and update_mmu_cache_pmd() to functions" from
the akpm tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20121210195402.1042a8ea5bfb57bb758007ac@canb.auug.org.au
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
mm/migrate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index 9562fa8..d599657 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1625,7 +1625,7 @@ int migrate_misplaced_transhuge_page_put(struct mm_struct *mm,
page_add_new_anon_rmap(new_page, vma, haddr);
set_pmd_at(mm, haddr, pmd, entry);
- update_mmu_cache_pmd(vma, address, entry);
+ update_mmu_cache_pmd(vma, address, &entry);
page_remove_rmap(page);
/*
* Finish the charge transaction under the page table lock to
prev parent reply other threads:[~2012-12-13 8:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 8:54 linux-next: build failure after merge of the akpm tree Stephen Rothwell
2012-12-10 10:43 ` Ingo Molnar
2012-12-13 8:36 ` tip-bot for Stephen Rothwell [this message]
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-8df383108f7b7eafcf89f26be5460b404c70ff29@git.kernel.org \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.