瀏覽代碼

[PATCH] likely cleanup: remove unlikely in sys_mprotect()

With likely/unlikely profiling on my not-so-busy-typical-developmentsystem
there are 5k misses vs 2k hits.  So I guess we should remove the unlikely.

Signed-off-by: Hua Zhong <hzhong@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hua Zhong 19 年之前
父節點
當前提交
b344e05c58
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      mm/mprotect.c

+ 1 - 2
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:
 	 * 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;
 		prot |= PROT_EXEC;
 
 
 	vm_flags = calc_vm_prot_bits(prot);
 	vm_flags = calc_vm_prot_bits(prot);