These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / include / asm / frame.h

diff --git a/kernel/arch/x86/include/asm/frame.h b/kernel/arch/x86/include/asm/frame.h
index 3b629f4..793179c 100644 (file)
--- a/kernel/arch/x86/include/asm/frame.h
+++ b/kernel/arch/x86/include/asm/frame.h
@@ -1,20 +1,17 @@
 #ifdef __ASSEMBLY__
 
 #include <asm/asm.h>
-#include <asm/dwarf2.h>
 
 /* The annotation hides the frame from the unwinder and makes it look
    like a ordinary ebp save/restore. This avoids some special cases for
    frame pointer later */
 #ifdef CONFIG_FRAME_POINTER
        .macro FRAME
-       __ASM_SIZE(push,_cfi)   %__ASM_REG(bp)
-       CFI_REL_OFFSET          __ASM_REG(bp), 0
+       __ASM_SIZE(push,)       %__ASM_REG(bp)
        __ASM_SIZE(mov)         %__ASM_REG(sp), %__ASM_REG(bp)
        .endm
        .macro ENDFRAME
-       __ASM_SIZE(pop,_cfi)    %__ASM_REG(bp)
-       CFI_RESTORE             __ASM_REG(bp)
+       __ASM_SIZE(pop,)        %__ASM_REG(bp)
        .endm
 #else
        .macro FRAME