diff options
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 78c9a1b9e6b0..565ee7a990ea 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -140,7 +140,8 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, | |||
140 | /* If the operation is a nop, then nop the callsite */ | 140 | /* If the operation is a nop, then nop the callsite */ |
141 | ret = paravirt_patch_nop(); | 141 | ret = paravirt_patch_nop(); |
142 | else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || | 142 | else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || |
143 | type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_syscall_ret)) | 143 | type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) || |
144 | type == PARAVIRT_PATCH(pv_cpu_ops.usersp_sysret)) | ||
144 | /* If operation requires a jmp, then jmp */ | 145 | /* If operation requires a jmp, then jmp */ |
145 | ret = paravirt_patch_jmp(insnbuf, opfunc, addr, len); | 146 | ret = paravirt_patch_jmp(insnbuf, opfunc, addr, len); |
146 | else | 147 | else |
@@ -191,7 +192,8 @@ static void native_flush_tlb_single(unsigned long addr) | |||
191 | 192 | ||
192 | /* These are in entry.S */ | 193 | /* These are in entry.S */ |
193 | extern void native_iret(void); | 194 | extern void native_iret(void); |
194 | extern void native_irq_enable_syscall_ret(void); | 195 | extern void native_irq_enable_sysexit(void); |
196 | extern void native_usersp_sysret(void); | ||
195 | 197 | ||
196 | static int __init print_banner(void) | 198 | static int __init print_banner(void) |
197 | { | 199 | { |
@@ -327,7 +329,11 @@ struct pv_cpu_ops pv_cpu_ops = { | |||
327 | .write_idt_entry = native_write_idt_entry, | 329 | .write_idt_entry = native_write_idt_entry, |
328 | .load_sp0 = native_load_sp0, | 330 | .load_sp0 = native_load_sp0, |
329 | 331 | ||
330 | .irq_enable_syscall_ret = native_irq_enable_syscall_ret, | 332 | #ifdef CONFIG_X86_32 |
333 | .irq_enable_sysexit = native_irq_enable_sysexit, | ||
334 | #else | ||
335 | .usersp_sysret = native_usersp_sysret, | ||
336 | #endif | ||
331 | .iret = native_iret, | 337 | .iret = native_iret, |
332 | .swapgs = native_swapgs, | 338 | .swapgs = native_swapgs, |
333 | 339 | ||