[compiler] Fix 64bit compile time errors

Apart from format specifier fixes there are two changes in proper code:
- Change type of regs in skge_hw to unsigned long
- Cast result of sizeof in myri10ge to uint32_t

Both don't change anything for i386 and should be fine on x86_64.

Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Joshua Oreman <oremanj@rwcr.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Piotr Jaroszyński
2010-03-30 15:33:20 +02:00
committed by Michael Brown
parent 905ea56753
commit 7c6d3752c9
6 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -1983,13 +1983,13 @@ static void skge_rx_refill(struct net_device *dev)
if (iob || (control & BMU_OWN))
continue;
DBG2("refilling rx desc %d: ", (ring->to_clean - ring->start));
DBG2("refilling rx desc %zd: ", (ring->to_clean - ring->start));
iob = alloc_iob(RX_BUF_SIZE);
if (iob) {
skge_rx_setup(skge, e, iob, RX_BUF_SIZE);
} else {
DBG("descr %d: alloc_iob() failed\n",
DBG("descr %zd: alloc_iob() failed\n",
(ring->to_clean - ring->start));
/* We pass the descriptor to the NIC even if the
* allocation failed. The card will stop as soon as it
@@ -2354,7 +2354,7 @@ static int skge_probe(struct pci_device *pdev,
hw->pdev = pdev;
hw->regs = (u32)ioremap(pci_bar_start(pdev, PCI_BASE_ADDRESS_0),
hw->regs = (unsigned long)ioremap(pci_bar_start(pdev, PCI_BASE_ADDRESS_0),
SKGE_REG_SIZE);
if (!hw->regs) {
DBG(PFX "cannot map device registers\n");