diff --git a/[refs] b/[refs] index 4235a5581c2c..bee78f22b414 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34b6f01a79bd65fbd06511d2cb7b28e33a506246 +refs/heads/master: cd0608e71e9757f4dae35bcfb4e88f4d1a03a8ab diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index 70f140447a28..668bbfee0cce 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -1164,6 +1164,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, + .read_tscp = native_read_tscp, + .iret = xen_iret, .irq_enable_sysexit = xen_sysexit, #ifdef CONFIG_X86_64