X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Ftraps.c;h=7ee7369d5aecb8b1ff7ffa445491a11d78cf6fdb;hb=eda2360ad18b7cde87728fad85c6735a52c2576e;hp=92b83e299ed375f90fad0ee830595ebed3d6d1c2;hpb=1d23c4518b1f3a03c278f23333149245c178d2a6;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 92b83e299ed3..7ee7369d5aec 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -384,7 +384,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code) goto exit; conditional_sti(regs); - if (!user_mode(regs)) + if (!user_mode_vm(regs)) die("bounds", regs, error_code); if (!cpu_feature_enabled(X86_FEATURE_MPX)) { @@ -637,7 +637,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) * then it's very likely the result of an icebp/int01 trap. * User wants a sigtrap for that. */ - if (!dr6 && user_mode(regs)) + if (!dr6 && user_mode_vm(regs)) user_icebp = 1; /* Catch kmemcheck conditions first of all! */