aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/paravirt.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86/paravirt.h')
-rw-r--r--include/asm-x86/paravirt.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
index 19fd3e67b08c..be7b934f6c54 100644
--- a/include/asm-x86/paravirt.h
+++ b/include/asm-x86/paravirt.h
@@ -121,7 +121,7 @@ struct pv_cpu_ops {
121 u64 (*read_pmc)(void); 121 u64 (*read_pmc)(void);
122 122
123 /* These two are jmp to, not actually called. */ 123 /* These two are jmp to, not actually called. */
124 void (*irq_enable_sysexit)(void); 124 void (*irq_enable_syscall_ret)(void);
125 void (*iret)(void); 125 void (*iret)(void);
126 126
127 struct pv_lazy_ops lazy_mode; 127 struct pv_lazy_ops lazy_mode;
@@ -1138,9 +1138,10 @@ static inline unsigned long __raw_local_irq_save(void)
1138 call *%cs:pv_irq_ops+PV_IRQ_irq_enable; \ 1138 call *%cs:pv_irq_ops+PV_IRQ_irq_enable; \
1139 popl %edx; popl %ecx; popl %eax) 1139 popl %edx; popl %ecx; popl %eax)
1140 1140
1141#define ENABLE_INTERRUPTS_SYSEXIT \ 1141#define ENABLE_INTERRUPTS_SYSCALL_RET \
1142 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), CLBR_NONE,\ 1142 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_syscall_ret),\
1143 jmp *%cs:pv_cpu_ops+PV_CPU_irq_enable_sysexit) 1143 CLBR_NONE, \
1144 jmp *%cs:pv_cpu_ops+PV_CPU_irq_enable_syscall_ret)
1144 1145
1145#define GET_CR0_INTO_EAX \ 1146#define GET_CR0_INTO_EAX \
1146 push %ecx; push %edx; \ 1147 push %ecx; push %edx; \