lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] s2io u64 use for uintptr_t

Browse Source 
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>
This commit is contained in:
viro@zenIV.linux.org.uk
2005-09-02 20:15:29 +01:00
committed by Linus Torvalds
parent 24c83d45d7
commit 8ae418cf85
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/s2io.c
View File

@@ -354,7 +354,7 @@ static int init_shared_mem(struct s2io_nic *nic)
int lst_size, lst_per_page; int lst_size, lst_per_page;
struct net_device *dev = nic->dev; struct net_device *dev = nic->dev;
#ifdef CONFIG_2BUFF_MODE #ifdef CONFIG_2BUFF_MODE
u64 tmp; unsigned long tmp;
buffAdd_t *ba; buffAdd_t *ba;
#endif #endif
@@ -542,18 +542,18 @@ static int init_shared_mem(struct s2io_nic *nic)
(BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
if (!ba->ba_0_org) if (!ba->ba_0_org)
return -ENOMEM; return -ENOMEM;
tmp = (u64) ba->ba_0_org; tmp = (unsigned long) ba->ba_0_org;
tmp += ALIGN_SIZE; tmp += ALIGN_SIZE;
tmp &= ~((u64) ALIGN_SIZE); tmp &= ~((unsigned long) ALIGN_SIZE);
ba->ba_0 = (void *) tmp; ba->ba_0 = (void *) tmp;
ba->ba_1_org = (void *) kmalloc ba->ba_1_org = (void *) kmalloc
(BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
if (!ba->ba_1_org) if (!ba->ba_1_org)
return -ENOMEM; return -ENOMEM;
tmp = (u64) ba->ba_1_org; tmp = (unsigned long) ba->ba_1_org;
tmp += ALIGN_SIZE; tmp += ALIGN_SIZE;
tmp &= ~((u64) ALIGN_SIZE); tmp &= ~((unsigned long) ALIGN_SIZE);
ba->ba_1 = (void *) tmp; ba->ba_1 = (void *) tmp;
k++; k++;
} }