Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index a5c0153ede37..7fdf324d5b51 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -78,6 +78,7 @@ EXPORT_SYMBOL(get_pci_dma_ops);
 static int get_phb_number(struct device_node *dn)
 {
         int ret, phb_id = -1;
+        u32 prop_32;
         u64 prop;
 
         /*
@@ -86,8 +87,10 @@ static int get_phb_number(struct device_node *dn)
          * reading "ibm,opal-phbid", only present in OPAL environment.
          */
         ret = of_property_read_u64(dn, "ibm,opal-phbid", &prop);
-        if (ret)
-                ret = of_property_read_u32_index(dn, "reg", 1, (u32 *)&prop);
+        if (ret) {
+                ret = of_property_read_u32_index(dn, "reg", 1, &prop_32);
+                prop = prop_32;
+        }
 
         if (!ret)
                 phb_id = (int)(prop & (MAX_PHBS - 1));