Commit 54f09876 authored by Linus Torvalds's avatar Linus Torvalds

Make vm86 traps correctly distinguish between vm86 and kernel mode.

parent 6f2f7e21
...@@ -276,8 +276,11 @@ static inline unsigned long get_cr2(void) ...@@ -276,8 +276,11 @@ static inline unsigned long get_cr2(void)
static inline void do_trap(int trapnr, int signr, char *str, int vm86, static inline void do_trap(int trapnr, int signr, char *str, int vm86,
struct pt_regs * regs, long error_code, siginfo_t *info) struct pt_regs * regs, long error_code, siginfo_t *info)
{ {
if (vm86 && regs->eflags & VM_MASK) if (regs->eflags & VM_MASK) {
goto vm86_trap; if (vm86)
goto vm86_trap;
goto trap_signal;
}
if (!(regs->xcs & 3)) if (!(regs->xcs & 3))
goto kernel_trap; goto kernel_trap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment