diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-18 13:37:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-18 13:37:19 +0100 |
| commit | faf34726275b225a9954f2901364c053e6e3d1f0 (patch) | |
| tree | 3ac169b40a37387cf986331b9371db8b0c5b7af7 /arch/x86/xen/irq.c | |
| parent | 77c2bedd8f1658a47e015e77ee1f86b619707735 (diff) | |
| parent | cff26c95b24c7b7147db17b623dee946bd25ec95 (diff) | |
Merge tag 'v4.14.56' into linux-linaro-lsk-v4.14
This is the 4.14.56 stable release
Diffstat (limited to 'arch/x86/xen/irq.c')
| -rw-r--r-- | arch/x86/xen/irq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 74179852e46c..7515a19fd324 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c @@ -128,8 +128,6 @@ static const struct pv_irq_ops xen_irq_ops __initconst = { void __init xen_init_irq_ops(void) { - /* For PVH we use default pv_irq_ops settings. */ - if (!xen_feature(XENFEAT_hvm_callback_vector)) - pv_irq_ops = xen_irq_ops; + pv_irq_ops = xen_irq_ops; x86_init.irqs.intr_init = xen_init_IRQ; } |