2 files changed, 17 insertions, 3 deletions

diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 0928f70639aa..4b0845249222 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -701,9 +701,15 @@ device_not_available_emulate:
         jne ok;                                 \
 label:                                          \
         movl TSS_sysenter_esp0+offset(%esp),%esp;       \
+        CFI_DEF_CFA esp, 0;                     \
+        CFI_UNDEFINED eip;                      \
         pushfl;                                 \
+        CFI_ADJUST_CFA_OFFSET 4;                \
         pushl $__KERNEL_CS;                     \
-        pushl $sysenter_past_esp
+        CFI_ADJUST_CFA_OFFSET 4;                \
+        pushl $sysenter_past_esp;               \
+        CFI_ADJUST_CFA_OFFSET 4;                \
+        CFI_REL_OFFSET eip, 0
 
 KPROBE_ENTRY(debug)
         RING0_INT_FRAME
@@ -754,6 +760,7 @@ KPROBE_ENTRY(nmi)
         cmpl $sysenter_entry,12(%esp)
         je nmi_debug_stack_check
 nmi_stack_correct:
+        /* We have a RING0_INT_FRAME here */
         pushl %eax
         CFI_ADJUST_CFA_OFFSET 4
         SAVE_ALL
@@ -764,9 +771,12 @@ nmi_stack_correct:
         CFI_ENDPROC
 
 nmi_stack_fixup:
+        RING0_INT_FRAME
         FIX_STACK(12,nmi_stack_correct, 1)
         jmp nmi_stack_correct
+
 nmi_debug_stack_check:
+        /* We have a RING0_INT_FRAME here */
         cmpw $__KERNEL_CS,16(%esp)
         jne nmi_stack_correct
         cmpl $debug,(%esp)
@@ -777,8 +787,10 @@ nmi_debug_stack_check:
         jmp nmi_stack_correct
 
 nmi_16bit_stack:
-        RING0_INT_FRAME
-        /* create the pointer to lss back */
+        /* We have a RING0_INT_FRAME here.
+         *
+         * create the pointer to lss back
+         */
         pushl %ss
         CFI_ADJUST_CFA_OFFSET 4
         pushl %esp
diff --git a/include/asm-i386/dwarf2.h b/include/asm-i386/dwarf2.h
index fe2392f361ee..5d1a8db5a9b0 100644
--- a/include/asm-i386/dwarf2.h
+++ b/include/asm-i386/dwarf2.h
@@ -26,6 +26,7 @@
 #define CFI_RESTORE .cfi_restore
 #define CFI_REMEMBER_STATE .cfi_remember_state
 #define CFI_RESTORE_STATE .cfi_restore_state
+#define CFI_UNDEFINED .cfi_undefined
 
 #else
 
@@ -46,6 +47,7 @@
 #define CFI_RESTORE     ignore
 #define CFI_REMEMBER_STATE ignore
 #define CFI_RESTORE_STATE ignore
+#define CFI_UNDEFINED ignore
 
 #endif