[Compile Regression in 2.4.25-pre8][PATCH 42/42]

Kronos
2004-02-02T20:08:54Z

yellowfin.c:1282: warning: unsigned int format, different type arg (arg 2)
yellowfin.c:1294: warning: unsigned int format, different type arg (arg 2)

dma_addr_t can be 64 bit long even on x86 (when CONFIG_HIGHMEM64G is
defined). Cast to dma64_addr_t in the printk.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/net/yellowfin.c linux-2.4/drivers/net/yellowfin.c
--- linux-2.4-vanilla/drivers/net/yellowfin.c Tue Nov 11 17:51:39 2003
+++ linux-2.4/drivers/net/yellowfin.c Sat Jan 31 19:26:34 2004
@@ -1279,7 +1279,7 @@

#if defined(__i386__)
if (yellowfin_debug > 2) {
- printk("\n"KERN_DEBUG" Tx ring at %8.8x:\n", yp->tx_ring_dma);
+ printk("\n"KERN_DEBUG" Tx ring at %8.8Lx:\n", (dma64_addr_r)yp->tx_ring_dma);
for (i = 0; i < TX_RING_SIZE*2; i++)
printk(" %c #%d desc. %8.8x %8.8x %8.8x %8.8x.\n",
inl(ioaddr + TxPtr) == (long)&yp->tx_ring[i] ? '>' : ' ',
@@ -1291,7 +1291,7 @@
i, yp->tx_status[i].tx_cnt, yp->tx_status[i].tx_errs,
yp->tx_status[i].total_tx_cnt, yp->tx_status[i].paused);

- printk("\n"KERN_DEBUG " Rx ring %8.8x:\n", yp->rx_ring_dma);
+ printk("\n"KERN_DEBUG " Rx ring %8.8Lx:\n", (dma64_addr_t)yp->rx_ring_dma);
for (i = 0; i < RX_RING_SIZE; i++) {
printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x %8.8x\n",
inl(ioaddr + RxPtr) == (long)&yp->rx_ring[i] ? '>' : ' ',

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
"It is more complicated than you think"
-- The Eighth Networking Truth from RFC 1925