diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-02 16:58:06 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 19:44:31 -0500 |
commit | 1f4f931501e9270c156d05ee76b7b872de486304 (patch) | |
tree | 932038883dec232c5ca4b0a86f6470cf16d3ea1a | |
parent | 0eb592dbba40baebec9cdde3ff4574185de6cbcc (diff) |
xen: fix 32-bit build resulting from mmu move
Moving the mmu code from enlighten.c to mmu.c inadvertently broke the
32-bit build. Fix it.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/xen/mmu.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 5e41f7fc6cf1..d2e8ed1aff3d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -1396,6 +1396,43 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) | |||
1396 | #endif | 1396 | #endif |
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | #ifdef CONFIG_HIGHPTE | ||
1400 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) | ||
1401 | { | ||
1402 | pgprot_t prot = PAGE_KERNEL; | ||
1403 | |||
1404 | if (PagePinned(page)) | ||
1405 | prot = PAGE_KERNEL_RO; | ||
1406 | |||
1407 | if (0 && PageHighMem(page)) | ||
1408 | printk("mapping highpte %lx type %d prot %s\n", | ||
1409 | page_to_pfn(page), type, | ||
1410 | (unsigned long)pgprot_val(prot) & _PAGE_RW ? "WRITE" : "READ"); | ||
1411 | |||
1412 | return kmap_atomic_prot(page, type, prot); | ||
1413 | } | ||
1414 | #endif | ||
1415 | |||
1416 | #ifdef CONFIG_X86_32 | ||
1417 | static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte) | ||
1418 | { | ||
1419 | /* If there's an existing pte, then don't allow _PAGE_RW to be set */ | ||
1420 | if (pte_val_ma(*ptep) & _PAGE_PRESENT) | ||
1421 | pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) & | ||
1422 | pte_val_ma(pte)); | ||
1423 | |||
1424 | return pte; | ||
1425 | } | ||
1426 | |||
1427 | /* Init-time set_pte while constructing initial pagetables, which | ||
1428 | doesn't allow RO pagetable pages to be remapped RW */ | ||
1429 | static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | ||
1430 | { | ||
1431 | pte = mask_rw_pte(ptep, pte); | ||
1432 | |||
1433 | xen_set_pte(ptep, pte); | ||
1434 | } | ||
1435 | #endif | ||
1399 | 1436 | ||
1400 | /* Early in boot, while setting up the initial pagetable, assume | 1437 | /* Early in boot, while setting up the initial pagetable, assume |
1401 | everything is pinned. */ | 1438 | everything is pinned. */ |