mm/core, arch, powerpc: Pass a protection key in to calc_vm_flag_bits()

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

diff --git a/mm/nommu.c b/mm/nommu.c
index b64d04d1970273d8e5e7010582ac7b0b5af608d1..5ba39b82f241e84dac496729dc7e00c075093f36 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1082,7 +1082,7 @@ static unsigned long determine_vm_flags(struct file *file,
 {
        unsigned long vm_flags;
 
-       vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags);
+       vm_flags = calc_vm_prot_bits(prot, 0) | calc_vm_flag_bits(flags);
        /* vm_flags |= mm->def_flags; */
 
        if (!(capabilities & NOMMU_MAP_DIRECT)) {