diff options
| author | viro@zenIV.linux.org.uk <viro@zenIV.linux.org.uk> | 2005-09-02 20:15:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:16:52 -0700 |
| commit | 8ae418cf85b92cae7bce3d810b6aaf354e77be84 (patch) | |
| tree | c893eef06ec20385780919dc8d9134689f81a42d /drivers/net/s2io.c | |
| parent | 24c83d45d76303db8325b8553a05c69c838ef370 (diff) | |
| download | linux-3.10-8ae418cf85b92cae7bce3d810b6aaf354e77be84.tar.gz linux-3.10-8ae418cf85b92cae7bce3d810b6aaf354e77be84.tar.bz2 linux-3.10-8ae418cf85b92cae7bce3d810b6aaf354e77be84.zip | |
[PATCH] s2io u64 use for uintptr_t
u64 is not uintptr_t; unsigned long is...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 5dda043bd9d..7f9a11fc3a1 100644 --- a/drivers/net/s2io.c +++ b/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++; } |