Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ae418cf authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] s2io u64 use for uintptr_t 



u64 is not uintptr_t; unsigned long is...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 24c83d45

drivers/net/s2io.c

+5 −5
Original line number Diff line number Diff line
@@ -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++;

			}