Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / powerpc / kvm / book3s_hv_rm_xics.c

diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c
index c2c9c733f3599dac4276c1b02879aedd9d170071..0a11ec88a0aef45cd398ad1e8bcaf95a4b7c887c 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@ -141,13 +141,6 @@ static void icp_rm_set_vcpu_irq(struct kvm_vcpu *vcpu,
                return;
        }
 
-       if (xive_enabled() && kvmhv_on_pseries()) {
-               /* No XICS access or hypercalls available, too hard */
-               this_icp->rm_action |= XICS_RM_KICK_VCPU;
-               this_icp->rm_kick_target = vcpu;
-               return;
-       }
-
        /*
         * Check if the core is loaded,
         * if not, find an available host core to post to wake the VCPU,
@@ -771,14 +764,6 @@ static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again)
        void __iomem *xics_phys;
        int64_t rc;
 
-       if (kvmhv_on_pseries()) {
-               unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-
-               iosync();
-               plpar_hcall_raw(H_EOI, retbuf, hwirq);
-               return;
-       }
-
        rc = pnv_opal_pci_msi_eoi(c, hwirq);
 
        if (rc)