From df54991644e969ed94db9413ed38521b39dde97b Mon Sep 17 00:00:00 2001 From: "viro@zenIV.linux.org.uk" Date: Fri, 2 Sep 2005 20:15:29 +0100 Subject: [PATCH] --- yaml --- r: 7529 b: refs/heads/master c: 8ae418cf85b92cae7bce3d810b6aaf354e77be84 h: refs/heads/master i: 7527: 87c4b5d0c6fb98cc021327117319651b839c62c6 v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2047fedf2cc6..323347c36db9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c83d45d76303db8325b8553a05c69c838ef370 +refs/heads/master: 8ae418cf85b92cae7bce3d810b6aaf354e77be84 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 5dda043bd9d7..7f9a11fc3a18 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -354,7 +354,7 @@ static int init_shared_mem(struct s2io_nic *nic) int lst_size, lst_per_page; struct net_device *dev = nic->dev; #ifdef CONFIG_2BUFF_MODE - u64 tmp; + unsigned long tmp; buffAdd_t *ba; #endif @@ -542,18 +542,18 @@ static int init_shared_mem(struct s2io_nic *nic) (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); if (!ba->ba_0_org) return -ENOMEM; - tmp = (u64) ba->ba_0_org; + tmp = (unsigned long) ba->ba_0_org; tmp += ALIGN_SIZE; - tmp &= ~((u64) ALIGN_SIZE); + tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_0 = (void *) tmp; ba->ba_1_org = (void *) kmalloc (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); if (!ba->ba_1_org) return -ENOMEM; - tmp = (u64) ba->ba_1_org; + tmp = (unsigned long) ba->ba_1_org; tmp += ALIGN_SIZE; - tmp &= ~((u64) ALIGN_SIZE); + tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_1 = (void *) tmp; k++; }