The following commit has been merged in the linux branch: commit 71fb62fb6dd4ed95e6f0240a2c627df396d9d057 Author: Dhananjay Phadke dhananjay@netxen.com Date: Tue Oct 13 00:26:04 2009 -0700

netxen: fix pci bar mapping

Use resource_size_t for PCI resource remapping instead of unsigned long. Physical addresses can exceed range of long data type (e.g with PAE).

Signed-off-by: Dhananjay Phadke dhananjay@netxen.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 9b9eab1..7fc15e9 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -595,7 +595,8 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) void __iomem *mem_ptr2 = NULL; void __iomem *db_ptr = NULL;

- unsigned long mem_base, mem_len, db_base, db_len = 0, pci_len0 = 0; + resource_size_t mem_base, db_base; + unsigned long mem_len, db_len = 0, pci_len0 = 0;

struct pci_dev *pdev = adapter->pdev; int pci_func = adapter->ahw.pci_func;