diff --git a/[refs] b/[refs] index 65d3d9b576fa..0287c437f0cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfd9b7df4abd3257c9e381b0e445817b26a51c0c +refs/heads/master: b344e05c585406904c70865e531e02467c4c7931 diff --git a/trunk/mm/mprotect.c b/trunk/mm/mprotect.c index 4c14d4289b61..5faf01ad3ef8 100644 --- a/trunk/mm/mprotect.c +++ b/trunk/mm/mprotect.c @@ -205,8 +205,7 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot) /* * Does the application expect PROT_READ to imply PROT_EXEC: */ - if (unlikely((prot & PROT_READ) && - (current->personality & READ_IMPLIES_EXEC))) + if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC)) prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot);