aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.c
diff options
context:
space:
mode:
authortrem <tremyfr@yahoo.fr>2007-10-02 17:04:38 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:28 -0400
commit1dad939ddbbd8d64e1edc7799df00a9e591b4197 (patch)
treeb2bb098cc125ed2761ceb9f3a906dc844f24347c /drivers/net/ipg.c
parentb5254eee7994ba0a44ba7386cb66c2ce2f30fcc6 (diff)
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>
Diffstat (limited to 'drivers/net/ipg.c')
-rw-r--r--drivers/net/ipg.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dfdc96fcadec..59898ce54dcf 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -25,6 +25,8 @@
25#include <linux/mii.h> 25#include <linux/mii.h>
26#include <linux/mutex.h> 26#include <linux/mutex.h>
27 27
28#include <asm/div64.h>
29
28#define IPG_RX_RING_BYTES (sizeof(struct ipg_rx) * IPG_RFDLIST_LENGTH) 30#define IPG_RX_RING_BYTES (sizeof(struct ipg_rx) * IPG_RFDLIST_LENGTH)
29#define IPG_TX_RING_BYTES (sizeof(struct ipg_tx) * IPG_TFDLIST_LENGTH) 31#define IPG_TX_RING_BYTES (sizeof(struct ipg_tx) * IPG_TFDLIST_LENGTH)
30#define IPG_RESET_MASK \ 32#define IPG_RESET_MASK \
@@ -836,10 +838,14 @@ static void ipg_nic_txfree(struct net_device *dev)
836{ 838{
837 struct ipg_nic_private *sp = netdev_priv(dev); 839 struct ipg_nic_private *sp = netdev_priv(dev);
838 void __iomem *ioaddr = sp->ioaddr; 840 void __iomem *ioaddr = sp->ioaddr;
839 const unsigned int curr = ipg_r32(TFD_LIST_PTR_0) - 841 unsigned int curr;
840 (sp->txd_map / sizeof(struct ipg_tx)) - 1; 842 u64 txd_map;
841 unsigned int released, pending; 843 unsigned int released, pending;
842 844
845 txd_map = (u64)sp->txd_map;
846 curr = ipg_r32(TFD_LIST_PTR_0) -
847 do_div(txd_map, sizeof(struct ipg_tx)) - 1;
848
843 IPG_DEBUG_MSG("_nic_txfree\n"); 849 IPG_DEBUG_MSG("_nic_txfree\n");
844 850
845 pending = sp->tx_current - sp->tx_dirty; 851 pending = sp->tx_current - sp->tx_dirty;