Commit e7a7c82b authored by Randy Dunlap's avatar Randy Dunlap Committed by Jeff Garzik

[PATCH] yellowfin: correct printk of dma_addr_t

fix dma_addr_t type error with CONFIG_HIGHMEM64G=y;
parent 5c5c05d7
...@@ -1286,7 +1286,8 @@ static int yellowfin_close(struct net_device *dev) ...@@ -1286,7 +1286,8 @@ static int yellowfin_close(struct net_device *dev)
#if defined(__i386__) #if defined(__i386__)
if (yellowfin_debug > 2) { 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.8llx:\n",
(unsigned long long)yp->tx_ring_dma);
for (i = 0; i < TX_RING_SIZE*2; i++) for (i = 0; i < TX_RING_SIZE*2; i++)
printk(" %c #%d desc. %8.8x %8.8x %8.8x %8.8x.\n", printk(" %c #%d desc. %8.8x %8.8x %8.8x %8.8x.\n",
inl(ioaddr + TxPtr) == (long)&yp->tx_ring[i] ? '>' : ' ', inl(ioaddr + TxPtr) == (long)&yp->tx_ring[i] ? '>' : ' ',
...@@ -1298,7 +1299,8 @@ static int yellowfin_close(struct net_device *dev) ...@@ -1298,7 +1299,8 @@ static int yellowfin_close(struct net_device *dev)
i, yp->tx_status[i].tx_cnt, yp->tx_status[i].tx_errs, 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); 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.8llx:\n",
(unsigned long long)yp->rx_ring_dma);
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x %8.8x\n", printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x %8.8x\n",
inl(ioaddr + RxPtr) == (long)&yp->rx_ring[i] ? '>' : ' ', inl(ioaddr + RxPtr) == (long)&yp->rx_ring[i] ? '>' : ' ',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment