aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/traps.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r--arch/i386/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index d510de7e4f2a..a807a2da581d 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -254,7 +254,7 @@ void show_registers(struct pt_regs *regs)
254 254
255 esp = (unsigned long) (&regs->esp); 255 esp = (unsigned long) (&regs->esp);
256 savesegment(ss, ss); 256 savesegment(ss, ss);
257 if (user_mode(regs)) { 257 if (user_mode_vm(regs)) {
258 in_kernel = 0; 258 in_kernel = 0;
259 esp = regs->esp; 259 esp = regs->esp;
260 ss = regs->xss & 0xffff; 260 ss = regs->xss & 0xffff;
@@ -644,7 +644,7 @@ void die_nmi (struct pt_regs *regs, const char *msg)
644 /* If we are in kernel we are probably nested up pretty bad 644 /* If we are in kernel we are probably nested up pretty bad
645 * and might aswell get out now while we still can. 645 * and might aswell get out now while we still can.
646 */ 646 */
647 if (!user_mode(regs)) { 647 if (!user_mode_vm(regs)) {
648 current->thread.trap_no = 2; 648 current->thread.trap_no = 2;
649 crash_kexec(regs); 649 crash_kexec(regs);
650 } 650 }