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

[kvmfornfv.git] / kernel / arch / x86 / lib / msr-reg.S

diff --git a/kernel/arch/x86/lib/msr-reg.S b/kernel/arch/x86/lib/msr-reg.S
index 3ca5218..c815564 100644 (file)
--- a/kernel/arch/x86/lib/msr-reg.S
+++ b/kernel/arch/x86/lib/msr-reg.S
@@ -1,6 +1,5 @@
 #include <linux/linkage.h>
 #include <linux/errno.h>
-#include <asm/dwarf2.h>
 #include <asm/asm.h>
 #include <asm/msr.h>
 
@@ -13,9 +12,8 @@
  */
 .macro op_safe_regs op
 ENTRY(\op\()_safe_regs)
-       CFI_STARTPROC
-       pushq_cfi_reg rbx
-       pushq_cfi_reg rbp
+       pushq %rbx
+       pushq %rbp
        movq    %rdi, %r10      /* Save pointer */
        xorl    %r11d, %r11d    /* Return value */
        movl    (%rdi), %eax
@@ -25,7 +23,6 @@ ENTRY(\op\()_safe_regs)
        movl    20(%rdi), %ebp
        movl    24(%rdi), %esi
        movl    28(%rdi), %edi
-       CFI_REMEMBER_STATE
 1:     \op
 2:     movl    %eax, (%r10)
        movl    %r11d, %eax     /* Return value */
@@ -35,16 +32,14 @@ ENTRY(\op\()_safe_regs)
        movl    %ebp, 20(%r10)
        movl    %esi, 24(%r10)
        movl    %edi, 28(%r10)
-       popq_cfi_reg rbp
-       popq_cfi_reg rbx
+       popq %rbp
+       popq %rbx
        ret
 3:
-       CFI_RESTORE_STATE
        movl    $-EIO, %r11d
        jmp     2b
 
        _ASM_EXTABLE(1b, 3b)
-       CFI_ENDPROC
 ENDPROC(\op\()_safe_regs)
 .endm
 
@@ -52,13 +47,12 @@ ENDPROC(\op\()_safe_regs)
 
 .macro op_safe_regs op
 ENTRY(\op\()_safe_regs)
-       CFI_STARTPROC
-       pushl_cfi_reg ebx
-       pushl_cfi_reg ebp
-       pushl_cfi_reg esi
-       pushl_cfi_reg edi
-       pushl_cfi $0              /* Return value */
-       pushl_cfi %eax
+       pushl %ebx
+       pushl %ebp
+       pushl %esi
+       pushl %edi
+       pushl $0              /* Return value */
+       pushl %eax
        movl    4(%eax), %ecx
        movl    8(%eax), %edx
        movl    12(%eax), %ebx
@@ -66,32 +60,28 @@ ENTRY(\op\()_safe_regs)
        movl    24(%eax), %esi
        movl    28(%eax), %edi
        movl    (%eax), %eax
-       CFI_REMEMBER_STATE
 1:     \op
-2:     pushl_cfi %eax
+2:     pushl %eax
        movl    4(%esp), %eax
-       popl_cfi (%eax)
+       popl (%eax)
        addl    $4, %esp
-       CFI_ADJUST_CFA_OFFSET -4
        movl    %ecx, 4(%eax)
        movl    %edx, 8(%eax)
        movl    %ebx, 12(%eax)
        movl    %ebp, 20(%eax)
        movl    %esi, 24(%eax)
        movl    %edi, 28(%eax)
-       popl_cfi %eax
-       popl_cfi_reg edi
-       popl_cfi_reg esi
-       popl_cfi_reg ebp
-       popl_cfi_reg ebx
+       popl %eax
+       popl %edi
+       popl %esi
+       popl %ebp
+       popl %ebx
        ret
 3:
-       CFI_RESTORE_STATE
        movl    $-EIO, 4(%esp)
        jmp     2b
 
        _ASM_EXTABLE(1b, 3b)
-       CFI_ENDPROC
 ENDPROC(\op\()_safe_regs)
 .endm