3 files changed, 16 insertions, 15 deletions

diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index fac43fd6fc8..6a843f7350a 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -150,7 +150,8 @@ static int __init ne3210_eisa_probe (struct device *device)
                 if (phys_mem < virt_to_phys(high_memory)) {
                         printk(KERN_CRIT "ne3210.c: Card RAM overlaps with normal memory!!!\n");
                         printk(KERN_CRIT "ne3210.c: Use EISA SCU to set card memory below 1MB,\n");
-                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%lx.\n", virt_to_phys(high_memory));
+                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%llx.\n",
+                                (u64)virt_to_phys(high_memory));
                         printk(KERN_CRIT "ne3210.c: Driver NOT installed.\n");
                         retval = -EINVAL;
                         goto out3;
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index d5378e60fcd..064307c2277 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -338,10 +338,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx,
         nic_data->next_buffer_table += buffer->entries;
 
         EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         return 0;
 }
@@ -353,10 +353,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,
                 return;
 
         EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, buffer->len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, buffer->len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr,
                             buffer->dma_addr);
@@ -2343,10 +2343,10 @@ int falcon_probe_port(struct efx_nic *efx)
                                  FALCON_MAC_STATS_SIZE);
         if (rc)
                 return rc;
-        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->stats_buffer.dma_addr,
+        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
+                (u64)efx->stats_buffer.dma_addr,
                 efx->stats_buffer.addr,
-                virt_to_phys(efx->stats_buffer.addr));
+                (u64)virt_to_phys(efx->stats_buffer.addr));
 
         return 0;
 }
@@ -2921,9 +2921,9 @@ int falcon_probe_nic(struct efx_nic *efx)
                 goto fail4;
         BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->irq_status.dma_addr,
-                efx->irq_status.addr, virt_to_phys(efx->irq_status.addr));
+        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
+                (u64)efx->irq_status.dma_addr,
+                efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr));
 
         falcon_probe_spi_devices(efx);
 
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index bfca15da6f0..14c11656e82 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1082,8 +1082,8 @@ static int __init arlan_probe_here(struct net_device *dev,
         if (arlan_check_fingerprint(memaddr))
                 return -ENODEV;
 
-        printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, 
-               (int) virt_to_phys((void*)memaddr));
+        printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name, 
+               (u64) virt_to_phys((void*)memaddr));
 
         ap->card = (void *) memaddr;
         dev->mem_start = memaddr;