From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Thu, 17 Jun 2010 01:42:44 +0000 (+0900)
Subject: PCI: fix wrong memory address handling in MSI-X
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b;p=linux-beck.git

PCI: fix wrong memory address handling in MSI-X

Use resource_size_t for MMIO address instead of unsigned long. Otherwise,
higher 32-bits of MMIO address are cleared unexpectedly in x86-32 PAE.

Acked-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 77b68eaf021e..6a0f2f07f955 100644
--- a/drivers/pci/msi.c
+++ b/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;