diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r-- | arch/x86/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index ae340d3761ca..181c53bac3a7 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -59,7 +59,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs) | |||
59 | int ret = 0; | 59 | int ret = 0; |
60 | 60 | ||
61 | /* kprobe_running() needs smp_processor_id() */ | 61 | /* kprobe_running() needs smp_processor_id() */ |
62 | if (kprobes_built_in() && !user_mode_vm(regs)) { | 62 | if (kprobes_built_in() && !user_mode(regs)) { |
63 | preempt_disable(); | 63 | preempt_disable(); |
64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) | 64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) |
65 | ret = 1; | 65 | ret = 1; |
@@ -1035,7 +1035,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs) | |||
1035 | if (error_code & PF_USER) | 1035 | if (error_code & PF_USER) |
1036 | return false; | 1036 | return false; |
1037 | 1037 | ||
1038 | if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC)) | 1038 | if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC)) |
1039 | return false; | 1039 | return false; |
1040 | 1040 | ||
1041 | return true; | 1041 | return true; |
@@ -1140,7 +1140,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
1140 | * User-mode registers count as a user access even for any | 1140 | * User-mode registers count as a user access even for any |
1141 | * potential system fault or CPU buglet: | 1141 | * potential system fault or CPU buglet: |
1142 | */ | 1142 | */ |
1143 | if (user_mode_vm(regs)) { | 1143 | if (user_mode(regs)) { |
1144 | local_irq_enable(); | 1144 | local_irq_enable(); |
1145 | error_code |= PF_USER; | 1145 | error_code |= PF_USER; |
1146 | flags |= FAULT_FLAG_USER; | 1146 | flags |= FAULT_FLAG_USER; |