summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2010-06-17 03:42:44 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-07-30 18:29:14 +0200
commit4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b (patch)
tree059617eb4f3350ce40cb44c9537dce7a1168e2ea /drivers
parentPCI: check return value of pci_enable_device() when enabling bridges (diff)
downloadlinux-4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b.tar.xz
linux-4302e0fb7fa5b071e30f3cfb68e85155b3d69d9b.zip
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>
Diffstat (limited to 'drivers')
-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)
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;