From d76aab76fa499bdcf361aa9d80b3112e392fef83 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 16 May 2008 21:17:06 +0100 Subject: [PATCH] --- yaml --- r: 97331 b: refs/heads/master c: 086ea3564a5378a06c7cbfaf9d2727bc58a8c285 h: refs/heads/master i: 97329: a595a621ca810f80bf87a1197a960469aceb0bc6 97327: 4274890e64c6f8e852aeee43922189ac5d6bbd0e v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 11 ++++++----- trunk/drivers/net/sfc/net_driver.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dc2f62e1bda4..4c84e0d8dc8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 184be0c21aba048cf510036edeee095e68740951 +refs/heads/master: 086ea3564a5378a06c7cbfaf9d2727bc58a8c285 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index 86d40295a777..f6131e578b44 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -778,15 +778,16 @@ static int efx_init_io(struct efx_nic *efx) efx->membase = ioremap_nocache(efx->membase_phys, efx->type->mem_map_size); if (!efx->membase) { - EFX_ERR(efx, "could not map memory BAR %d at %lx+%x\n", - efx->type->mem_bar, efx->membase_phys, + EFX_ERR(efx, "could not map memory BAR %d at %llx+%x\n", + efx->type->mem_bar, + (unsigned long long)efx->membase_phys, efx->type->mem_map_size); rc = -ENOMEM; goto fail4; } - EFX_LOG(efx, "memory BAR %u at %lx+%x (virtual %p)\n", - efx->type->mem_bar, efx->membase_phys, efx->type->mem_map_size, - efx->membase); + EFX_LOG(efx, "memory BAR %u at %llx+%x (virtual %p)\n", + efx->type->mem_bar, (unsigned long long)efx->membase_phys, + efx->type->mem_map_size, efx->membase); return 0; diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h index 18b21ef23014..a84f9756ca71 100644 --- a/trunk/drivers/net/sfc/net_driver.h +++ b/trunk/drivers/net/sfc/net_driver.h @@ -686,7 +686,7 @@ struct efx_nic { struct workqueue_struct *workqueue; struct work_struct reset_work; struct delayed_work monitor_work; - unsigned long membase_phys; + resource_size_t membase_phys; void __iomem *membase; spinlock_t biu_lock; enum efx_int_mode interrupt_mode;