---

yaml --- r: 28917 b: refs/heads/master c: b344e05 h: refs/heads/master i: 28915: 08e2096 v: v3
git-mirror · Jun 23, 2006 · 512f72a · 512f72a
1 parent eb8a837
commit 512f72a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);