diff --git a/[refs] b/[refs]
index 0ba18e09031a..03e45d6c57c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2eb5ebd3665a38a4526b45cb3a31a132b2aa9927
+refs/heads/master: 4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 77b68eaf021e..6a0f2f07f955 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -435,7 +435,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
 static void __iomem *msix_map_region(struct pci_dev *dev, unsigned pos,
 							unsigned nr_entries)
 {
-	unsigned long phys_addr;
+	resource_size_t phys_addr;
 	u32 table_offset;
 	u8 bir;