aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-03-31 00:21:27 -0800
committerTony Luck <tony.luck@intel.com>2005-03-31 00:21:27 -0800
commitde69281a2124509eb96a50a6b95e033e8e2af871 (patch)
tree242982deb3c813a0e863f3536ed8ced070b34ef5
parent1f892e799c51bb4395f15c9b10e6d0355309e468 (diff)
downloadhistory-de69281a2124509eb96a50a6b95e033e8e2af871.tar.gz
[IA64] Andrew's fixes for warnings on ia64 build
drivers/pci/msi.c: In function `msi_set_mask_bit': drivers/pci/msi.c:70: warning: cast from pointer to integer of different size drivers/pci/msi.c: In function `msi_capability_init': drivers/pci/msi.c:558: warning: cast to pointer from integer of different size Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--drivers/pci/msi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 3f70e4926cb613..5425e0f77d8608 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -67,7 +67,7 @@ static void msi_set_mask_bit(unsigned int vector, int flag)
int pos;
u32 mask_bits;
- pos = (int)entry->mask_base;
+ pos = (long)entry->mask_base;
pci_read_config_dword(entry->dev, pos, &mask_bits);
mask_bits &= ~(1);
mask_bits |= flag;
@@ -555,7 +555,7 @@ static int msi_capability_init(struct pci_dev *dev)
dev->irq = vector;
entry->dev = dev;
if (is_mask_bit_support(control)) {
- entry->mask_base = (void __iomem *)msi_mask_bits_reg(pos,
+ entry->mask_base = (void __iomem *)(long)msi_mask_bits_reg(pos,
is_64bit_address(control));
}
/* Replace with MSI handler */