diff options
Diffstat (limited to 'arch/x86/xen/irq.c')
| -rw-r--r-- | arch/x86/xen/irq.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 0da7f863056f..76ca326105f7 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c @@ -5,6 +5,7 @@  #include <xen/interface/xen.h>  #include <xen/interface/sched.h>  #include <xen/interface/vcpu.h> +#include <xen/features.h>  #include <xen/events.h>  #include <asm/xen/hypercall.h> @@ -128,6 +129,8 @@ static const struct pv_irq_ops xen_irq_ops __initconst = {  void __init xen_init_irq_ops(void)  { -	pv_irq_ops = xen_irq_ops; +	/* For PVH we use default pv_irq_ops settings. */ +	if (!xen_feature(XENFEAT_hvm_callback_vector)) +		pv_irq_ops = xen_irq_ops;  	x86_init.irqs.intr_init = xen_init_IRQ;  }  |