summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-10-07 16:12:55 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:55:35 -0800
commit66b184ceae022098ab8110c32f487025b065d7c1 (patch)
tree53067ca0a63112e0646bb57744bd48b4d880c404 /arch/powerpc
parentcfd854909d7d68b752456137f14601bbae66d7d4 (diff)
downloadlinux-stable-66b184ceae022098ab8110c32f487025b065d7c1.tar.gz
linux-stable-66b184ceae022098ab8110c32f487025b065d7c1.tar.bz2
linux-stable-66b184ceae022098ab8110c32f487025b065d7c1.zip
powerpc/pseries: Honor the generic "no_64bit_msi" flag
commit 415072a041bf50dbd6d56934ffc0cbbe14c97be8 upstream. Instead of the arch specific quirk which we are deprecating Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/pseries/msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 0c882e83c4ce..6849d85ea0d5 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -428,7 +428,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) {
/*