[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>
This commit is contained in:
parent
24c83d45d7
commit
8ae418cf85
|
@ -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++;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue