aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2010-06-16 21:42:44 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-07-30 12:29:14 -0400
commit4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b (patch)
tree059617eb4f3350ce40cb44c9537dce7a1168e2ea
parent2eb5ebd3665a38a4526b45cb3a31a132b2aa9927 (diff)
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>
-rw-r--r--drivers/pci/msi.c2
1 files changed, 1 insertions, 1 deletions
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)
435static void __iomem *msix_map_region(struct pci_dev *dev, unsigned pos, 435static void __iomem *msix_map_region(struct pci_dev *dev, unsigned pos,
436 unsigned nr_entries) 436 unsigned nr_entries)
437{ 437{
438 unsigned long phys_addr; 438 resource_size_t phys_addr;
439 u32 table_offset; 439 u32 table_offset;
440 u8 bir; 440 u8 bir;
441 441