diff --git a/[refs] b/[refs]
index 45407a1c8d7d..901a007577ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c6b2353dfb80ae843b831c03fc53ddc5c3949ff
+refs/heads/master: dce4c92d69db53ed0e09191428f17ac9a14ad248
diff --git a/trunk/arch/powerpc/sysdev/ppc4xx_msi.c b/trunk/arch/powerpc/sysdev/ppc4xx_msi.c
index cc17f591bd66..82c6702dcbab 100644
--- a/trunk/arch/powerpc/sysdev/ppc4xx_msi.c
+++ b/trunk/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -175,8 +175,8 @@ static int ppc4xx_setup_pcieh_hw(struct platform_device *dev,
 	msi_virt = dma_alloc_coherent(&dev->dev, 64, &msi_phys, GFP_KERNEL);
 	if (!msi_virt)
 		return -ENOMEM;
-	msi->msi_addr_hi = (u32)(msi_phys >> 32);
-	msi->msi_addr_lo = (u32)(msi_phys & 0xffffffff);
+	msi->msi_addr_hi = upper_32_bits(msi_phys);
+	msi->msi_addr_lo = lower_32_bits(msi_phys & 0xffffffff);
 	dev_dbg(&dev->dev, "PCIE-MSI: msi address high 0x%x, low 0x%x\n",
 		msi->msi_addr_hi, msi->msi_addr_lo);