From 0524e0d2487341b3a988c32d1ceaea8544535372 Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Tue, 9 Sep 2008 21:56:16 +0200 Subject: [PATCH] --- yaml --- r: 113509 b: refs/heads/master c: e0c7317557c8fc8eacf611e30c2a80f4e24e47a3 h: refs/heads/master i: 113507: 921faaba37312ddfc13c58fdbe8845b00a77a6ce v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_32.S | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b0d2ade158e4..8f1841b3a700 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43024a8a5d4c63952687286f3083f7f34d4da2cc +refs/heads/master: e0c7317557c8fc8eacf611e30c2a80f4e24e47a3 diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S index a278505baa11..2abdc9a9f7bc 100644 --- a/trunk/arch/x86/kernel/entry_32.S +++ b/trunk/arch/x86/kernel/entry_32.S @@ -849,6 +849,7 @@ nmi_stack_correct: pushl %eax CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi @@ -889,6 +890,7 @@ nmi_espfix_stack: pushl %eax CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi