Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[tomoyo/tomoyo-test1.git] / arch / x86 / xen / mmu_pv.c

diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c
index eb3bac0..1652c39 100644 (file)
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -166,7 +166,7 @@ void make_lowmem_page_readwrite(void *vaddr)
        if (pte == NULL)
                return;         /* vaddr missing */
 
-       ptev = pte_mkwrite(*pte);
+       ptev = pte_mkwrite_novma(*pte);
 
        if (HYPERVISOR_update_va_mapping(address, ptev, 0))
                BUG();
@@ -667,7 +667,7 @@ static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm)
        spinlock_t *ptl = NULL;
 
 #if USE_SPLIT_PTE_PTLOCKS
-       ptl = ptlock_ptr(page);
+       ptl = ptlock_ptr(page_ptdesc(page));
        spin_lock_nest_lock(ptl, &mm->page_table_lock);
 #endif