diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 07:32:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:58 -0500 |
| commit | 015c8dd0cb3b380cb4c3930968250c719d1dd303 (patch) | |
| tree | e3a48752b262cc713bc57d780760c743e0146a80 | |
| parent | 4891645e764d2e181b834509a689fcd12e890c10 (diff) | |
xen: mask out PWT too
The hypervisor doesn't allow PCD or PWT to be set on guest ptes, so
make sure they're masked out. Also, fix up some previous mispatching.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/xen/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 52f392893008..3e9e095c295c 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -291,7 +291,7 @@ pte_t xen_make_pte(unsigned long pte) | |||
| 291 | if (pte & _PAGE_PRESENT) | 291 | if (pte & _PAGE_PRESENT) |
| 292 | pte = phys_to_machine(XPADDR(pte)).maddr; | 292 | pte = phys_to_machine(XPADDR(pte)).maddr; |
| 293 | 293 | ||
| 294 | pte &= ~_PAGE_PCD; | 294 | pte &= ~(_PAGE_PCD | _PAGE_PWT); |
| 295 | 295 | ||
| 296 | return (pte_t){ pte }; | 296 | return (pte_t){ pte }; |
| 297 | } | 297 | } |