Merge branch 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[karo-tx-linux.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 e78542d99cd637f2a749cb03d150f4f5ce1b48eb..ffde4507ddfd0629305ffaf0afccc0fdc7cd3749 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@ -16,7 +16,6 @@
 #include <asm/kvm_ppc.h>
 #include <asm/hvcall.h>
 #include <asm/xics.h>
-#include <asm/debug.h>
 #include <asm/synch.h>
 #include <asm/cputhreads.h>
 #include <asm/pgtable.h>
@@ -766,7 +765,7 @@ unsigned long eoi_rc;
 
 static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again)
 {
-       unsigned long xics_phys;
+       void __iomem *xics_phys;
        int64_t rc;
 
        rc = pnv_opal_pci_msi_eoi(c, hwirq);
@@ -779,7 +778,7 @@ static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again)
        /* EOI it */
        xics_phys = local_paca->kvm_hstate.xics_phys;
        if (xics_phys) {
-               _stwcix(xics_phys + XICS_XIRR, xirr);
+               __raw_rm_writel(xirr, xics_phys + XICS_XIRR);
        } else {
                rc = opal_int_eoi(be32_to_cpu(xirr));
                *again = rc > 0;