浏览代码

x86: coalesce tests

Coalesce v8086_mode and user_mode into a single
user_mode_vm() test.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Glauber Costa 17 年之前
父节点
当前提交
2c44e66843
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      arch/x86/kernel/time_32.c

+ 1 - 2
arch/x86/kernel/time_32.c

@@ -47,8 +47,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 	unsigned long pc = instruction_pointer(regs);
 	unsigned long pc = instruction_pointer(regs);
 
 
 #ifdef CONFIG_SMP
 #ifdef CONFIG_SMP
-	if (!v8086_mode(regs) && !user_mode(regs) &&
-	    in_lock_functions(pc)) {
+	if (!user_mode_vm(regs) && in_lock_functions(pc)) {
 #ifdef CONFIG_FRAME_POINTER
 #ifdef CONFIG_FRAME_POINTER
 		return *(unsigned long *)(regs->bp + 4);
 		return *(unsigned long *)(regs->bp + 4);
 #else
 #else