From cf3c6318e8641503860f282d0e626938c5853476 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Sun, 13 Nov 2005 16:06:52 -0800 Subject: [PATCH] --- yaml --- r: 14051 b: refs/heads/master c: e27182088e607880713d9c286a3d92d861c280e4 h: refs/heads/master i: 14049: 1243a82726115c7b068d01e0b69f01dc77666e39 14047: 96f38e3551bd2818f8132811587d11dca5b00107 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/entry.S | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index de9107143f41..bb51a35253bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27d99f7ead8cd6d2231798bff0d4c38814afea22 +refs/heads/master: e27182088e607880713d9c286a3d92d861c280e4 diff --git a/trunk/arch/i386/kernel/entry.S b/trunk/arch/i386/kernel/entry.S index 9e24f7b207ee..e50b93155249 100644 --- a/trunk/arch/i386/kernel/entry.S +++ b/trunk/arch/i386/kernel/entry.S @@ -560,11 +560,10 @@ nmi_stack_fixup: nmi_debug_stack_check: cmpw $__KERNEL_CS,16(%esp) jne nmi_stack_correct - cmpl $debug - 1,(%esp) - jle nmi_stack_correct + cmpl $debug,(%esp) + jb nmi_stack_correct cmpl $debug_esp_fix_insn,(%esp) - jle nmi_debug_stack_fixup -nmi_debug_stack_fixup: + ja nmi_stack_correct FIX_STACK(24,nmi_stack_correct, 1) jmp nmi_stack_correct