mm/core, x86/mm/pkeys: Differentiate instruction fetches

[linux-2.6-block.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 76c44e5dffa2b6c0a157f4af6e640323084a7388..99e9f928264ac30190aacb712cca42357ff56daa 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3380,6 +3380,7 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
        pte_t *pte;
 
        if (!arch_vma_access_permitted(vma, flags & FAULT_FLAG_WRITE,
+                                           flags & FAULT_FLAG_INSTRUCTION,
                                            flags & FAULT_FLAG_REMOTE))
                return VM_FAULT_SIGSEGV;