From 1e4f2baadf51650c655db8087dd4b4105ee3f4a5 Mon Sep 17 00:00:00 2001 From: Stas Sergeev Date: Mon, 23 Feb 2009 19:13:07 +0300 Subject: [PATCH] --- yaml --- r: 136923 b: refs/heads/master c: bda3a89745d7bb88d3e735046c0cdc3d0eb2ac24 h: refs/heads/master i: 136921: db3c1249e445b8c5923c22603cd471c4211efab9 136919: 07ce6c8981285a874beaaded572f4ac86fe23690 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_32.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dab359777c5e..7040411f0458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2366c298b5afe52e635afd5604b69ce9fd4471fc +refs/heads/master: bda3a89745d7bb88d3e735046c0cdc3d0eb2ac24 diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S index 999e827ef9c7..899e8938e79f 100644 --- a/trunk/arch/x86/kernel/entry_32.S +++ b/trunk/arch/x86/kernel/entry_32.S @@ -1359,7 +1359,7 @@ nmi_espfix_stack: CFI_ADJUST_CFA_OFFSET 4 pushl %esp CFI_ADJUST_CFA_OFFSET 4 - addw $4, (%esp) + addl $4, (%esp) /* copy the iret frame of 12 bytes */ .rept 3 pushl 16(%esp)