summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:34:07 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:34:07 +0100
commita72a08a4b61cb8868606a69b744848552e92062b (patch)
treea82c77096eece34c0536de656959aa879cb02687 /arch
parentx86: make sure initmem is writable (diff)
downloadlinux-a72a08a4b61cb8868606a69b744848552e92062b.tar.xz
linux-a72a08a4b61cb8868606a69b744848552e92062b.zip
x86: cpa: fix split thinko
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/pageattr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 23f0aa3d01c1..a2ee317548f2 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -216,8 +216,12 @@ repeat:
prot = static_protections(prot, address);
if (level == PG_LEVEL_4K) {
+ WARN_ON_ONCE(pgprot_val(prot) & _PAGE_PSE);
set_pte_atomic(kpte, pfn_pte(pfn, canon_pgprot(prot)));
} else {
+ /* Clear the PSE bit for the 4k level pages ! */
+ pgprot_val(prot) = pgprot_val(prot) & ~_PAGE_PSE;
+
err = split_large_page(kpte, address);
if (!err)
goto repeat;