diff options
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f586e63b9a63..70b355d3a86c 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -203,10 +203,10 @@ static unsigned long xen_get_debugreg(int reg) | |||
203 | return HYPERVISOR_get_debugreg(reg); | 203 | return HYPERVISOR_get_debugreg(reg); |
204 | } | 204 | } |
205 | 205 | ||
206 | static void xen_leave_lazy_cpu(void) | 206 | static void xen_end_context_switch(struct task_struct *next) |
207 | { | 207 | { |
208 | xen_mc_flush(); | 208 | xen_mc_flush(); |
209 | paravirt_leave_lazy_cpu(); | 209 | paravirt_end_context_switch(next); |
210 | } | 210 | } |
211 | 211 | ||
212 | static unsigned long xen_store_tr(void) | 212 | static unsigned long xen_store_tr(void) |
@@ -817,10 +817,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { | |||
817 | /* Xen takes care of %gs when switching to usermode for us */ | 817 | /* Xen takes care of %gs when switching to usermode for us */ |
818 | .swapgs = paravirt_nop, | 818 | .swapgs = paravirt_nop, |
819 | 819 | ||
820 | .lazy_mode = { | 820 | .start_context_switch = paravirt_start_context_switch, |
821 | .enter = paravirt_enter_lazy_cpu, | 821 | .end_context_switch = xen_end_context_switch, |
822 | .leave = xen_leave_lazy_cpu, | ||
823 | }, | ||
824 | }; | 822 | }; |
825 | 823 | ||
826 | static const struct pv_apic_ops xen_apic_ops __initdata = { | 824 | static const struct pv_apic_ops xen_apic_ops __initdata = { |