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

[karo-tx-linux.git] / arch / powerpc / platforms / pseries / msi.c

diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 8ab5add4ac824f43c6a6b299b24ed15bf0deafb2..691a154c286de46b5bc9ed26b9729518ebd023ed 100644 (file)
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -420,7 +420,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type)
         */
 again:
        if (type == PCI_CAP_ID_MSI) {
-               if (pdn->force_32bit_msi) {
+               if (pdev->no_64bit_msi) {
                        rc = rtas_change_msi(pdn, RTAS_CHANGE_32MSI_FN, nvec);
                        if (rc < 0) {
                                /*
@@ -476,7 +476,7 @@ again:
                irq_set_msi_desc(virq, entry);
 
                /* Read config space back so we can restore after reset */
-               __read_msi_msg(entry, &msg);
+               __pci_read_msi_msg(entry, &msg);
                entry->msg = msg;
        }