* [PATCH] s2io u64 use for uintptr_t
@ 2005-08-30 16:52 Al Viro
0 siblings, 0 replies; 2+ messages in thread
From: Al Viro @ 2005-08-30 16:52 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, Jeff Garzik
u64 is not uintptr_t; unsigned long is.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC13-base/drivers/net/s2io.c current/drivers/net/s2io.c
--- RC13-base/drivers/net/s2io.c 2005-08-30 03:24:42.000000000 -0400
+++ current/drivers/net/s2io.c 2005-08-30 03:25:18.000000000 -0400
@@ -354,7 +354,7 @@
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 @@
(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++;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] s2io u64 use for uintptr_t
@ 2005-09-02 19:15 viro
0 siblings, 0 replies; 2+ messages in thread
From: viro @ 2005-09-02 19:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jeff Garzik, linux-kernel
u64 is not uintptr_t; unsigned long is...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC13-segment/drivers/net/s2io.c RC13-s2io-u64/drivers/net/s2io.c
--- RC13-segment/drivers/net/s2io.c 2005-09-02 03:33:39.000000000 -0400
+++ RC13-s2io-u64/drivers/net/s2io.c 2005-09-02 03:34:23.000000000 -0400
@@ -354,7 +354,7 @@
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 @@
(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++;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-09-19 18:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-02 19:15 [PATCH] s2io u64 use for uintptr_t viro
-- strict thread matches above, loose matches on Subject: below --
2005-08-30 16:52 Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox