From: tip-bot for Ingo Molnar <mingo@kernel.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
ralf@linux-mips.org, peterz@infradead.org, sfr@canb.auug.org.au,
tglx@linutronix.de
Subject: [tip:numa/core] MIPS/thp: Fix update_mmu_cache() cache call
Date: Fri, 19 Oct 2012 18:08:16 -0700 [thread overview]
Message-ID: <tip-7fc4d49214dba401f4b92ed62da60a5b257a653a@git.kernel.org> (raw)
In-Reply-To: <20121018145101.GA17439@linux-mips.org>
Commit-ID: 7fc4d49214dba401f4b92ed62da60a5b257a653a
Gitweb: http://git.kernel.org/tip/7fc4d49214dba401f4b92ed62da60a5b257a653a
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Sat, 20 Oct 2012 00:33:01 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 20 Oct 2012 00:39:02 +0200
MIPS/thp: Fix update_mmu_cache() cache call
As per recent upstream commit:
b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code.
The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd()
as well.
This resolves a MIPS build error triggered on linux-next.
Reported-by: Ralf Baechle <ralf@linux-mips.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20121018145101.GA17439@linux-mips.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
mm/huge_memory.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 8100c01..1068e78 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -770,7 +770,7 @@ fixup:
/* change back to regular protection */
entry = pmd_modify(entry, vma->vm_page_prot);
set_pmd_at(mm, haddr, pmd, entry);
- update_mmu_cache(vma, address, entry);
+ update_mmu_cache_pmd(vma, address, entry);
unlock:
spin_unlock(&mm->page_table_lock);
@@ -846,7 +846,7 @@ migrate:
page_add_new_anon_rmap(new_page, vma, haddr);
set_pmd_at(mm, haddr, pmd, entry);
- update_mmu_cache(vma, address, entry);
+ update_mmu_cache_pmd(vma, address, entry);
page_remove_rmap(page);
spin_unlock(&mm->page_table_lock);
next prev parent reply other threads:[~2012-10-20 1:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 6:22 linux-next: build failure after merge of the final tree (tip/s390 trees related) Stephen Rothwell
2012-10-18 14:51 ` Ralf Baechle
2012-10-19 2:56 ` Stephen Rothwell
2012-10-19 21:48 ` Ingo Molnar
2012-10-20 1:07 ` [tip:numa/core] MIPS/thp: Add pmd_pgprot() implementation tip-bot for Ralf Baechle
2012-10-20 1:08 ` tip-bot for Ingo Molnar [this message]
2012-10-18 15:02 ` linux-next: build failure after merge of the final tree (tip/s390 trees related) Ralf Baechle
2012-10-19 21:52 ` Peter Zijlstra
2012-10-19 22:36 ` Ingo Molnar
2012-10-19 22:39 ` Ingo Molnar
2012-10-20 2:31 ` Stephen Rothwell
2012-10-18 16:26 ` Gerald Schaefer
2012-10-19 2:57 ` Stephen Rothwell
2012-10-19 21:37 ` Ingo Molnar
2012-10-20 1:06 ` [tip:numa/core] s390/thp: implement pmd_pgprot() for s390 tip-bot for Gerald Schaefer
2012-10-28 13:10 ` [PATCH] s390: Add pmd_mknotpresent() Ingo Molnar
2012-10-28 17:16 ` [tip:numa/core] sched, numa, mm, s390/thp: " tip-bot for Ingo Molnar
2012-10-29 7:49 ` [PATCH] s390: " Martin Schwidefsky
2012-10-29 11:05 ` Ingo Molnar
2012-10-29 11:30 ` Martin Schwidefsky
2012-10-29 14:00 ` Gerald Schaefer
2012-10-30 7:25 ` Ingo Molnar
2012-10-18 18:29 ` linux-next: build failure after merge of the final tree (tip/s390 trees related) Ingo Molnar
2012-10-19 3:07 ` Stephen Rothwell
2012-10-19 22:43 ` Ingo Molnar
2012-10-20 2:32 ` Stephen Rothwell
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-7fc4d49214dba401f4b92ed62da60a5b257a653a@git.kernel.org \
--to=mingo@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--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.