ipg.c doesn't compile with with CONFIG_HIGHMEM64G
I've tried to compile 2.6.23-rc8-mm2, but it fails on ipg.c with the error : ERROR: "__udivdi3" [drivers/net/ipg.ko] undefined! I've instigated a bit, and I've found this code in ipg.c : static void ipg_nic_txfree(struct net_device *dev) { struct ipg_nic_private *sp = netdev_priv(dev); void __iomem *ioaddr = sp->ioaddr; const unsigned int curr = ipg_r32(TFD_LIST_PTR_0) - (sp->txd_map / sizeof(struct ipg_tx)) - 1; unsigned int released, pending; sp->txd_map is an u64 because : dma_addr_t txd_map; And in asm-i386/types.h, I see : #ifdef CONFIG_HIGHMEM64G typedef u64 dma_addr_t; #else typedef u32 dma_addr_t; #endif I my config, I use CONFIG_HIGHMEM64G sizeof(struct ipg_tx) is an u32 So the div failed on i386 because of u64 / u32. [akpm@linux-foundation.org: cleanups] Cc: Sorbica Shieh <sorbica@icplus.com.tw> Cc: Jesse Huang <jesse@icplus.com.tw> Cc: Jeff Garzik <jeff@garzik.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
b5254eee79
commit
1dad939ddb
1 changed files with 8 additions and 2 deletions
|
@ -25,6 +25,8 @@
|
|||
#include <linux/mii.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include <asm/div64.h>
|
||||
|
||||
#define IPG_RX_RING_BYTES (sizeof(struct ipg_rx) * IPG_RFDLIST_LENGTH)
|
||||
#define IPG_TX_RING_BYTES (sizeof(struct ipg_tx) * IPG_TFDLIST_LENGTH)
|
||||
#define IPG_RESET_MASK \
|
||||
|
@ -836,10 +838,14 @@ static void ipg_nic_txfree(struct net_device *dev)
|
|||
{
|
||||
struct ipg_nic_private *sp = netdev_priv(dev);
|
||||
void __iomem *ioaddr = sp->ioaddr;
|
||||
const unsigned int curr = ipg_r32(TFD_LIST_PTR_0) -
|
||||
(sp->txd_map / sizeof(struct ipg_tx)) - 1;
|
||||
unsigned int curr;
|
||||
u64 txd_map;
|
||||
unsigned int released, pending;
|
||||
|
||||
txd_map = (u64)sp->txd_map;
|
||||
curr = ipg_r32(TFD_LIST_PTR_0) -
|
||||
do_div(txd_map, sizeof(struct ipg_tx)) - 1;
|
||||
|
||||
IPG_DEBUG_MSG("_nic_txfree\n");
|
||||
|
||||
pending = sp->tx_current - sp->tx_dirty;
|
||||
|
|
Loading…
Reference in a new issue