Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 4 insertions, 3 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 3354fdd83d4b..1d102b956fd8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -72,8 +72,9 @@ pgprot_t protection_map[16] = {
 
 pgprot_t vm_get_page_prot(unsigned long vm_flags)
 {
-        return protection_map[vm_flags &
-                                (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
+        return __pgprot(pgprot_val(protection_map[vm_flags &
+                                (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
+                        pgprot_val(arch_vm_get_page_prot(vm_flags)));
 }
 EXPORT_SYMBOL(vm_get_page_prot);
 
diff --git a/mm/mprotect.c b/mm/mprotect.c
index acfe7c8d72fc..360d9cc8b38c 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -237,7 +237,7 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot)
         end = start + len;
         if (end <= start)
                 return -ENOMEM;
-        if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM))
+        if (!arch_validate_prot(prot))
                 return -EINVAL;
 
         reqprot = prot;