diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /arch/i386/kernel/entry.S | |
| parent | 68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff) | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| download | blackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.gz blackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 9e24f7b207ee..e50b93155249 100644 --- a/arch/i386/kernel/entry.S +++ b/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 |
