aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/subscr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 16:22:32 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 17:06:41 -0500
commit880b005f294454d989783d0984dc554dfe3c8214 (patch)
treed1cffd5367f0bc939ef6952f6dacd78fb8592f39 /net/tipc/subscr.c
parente86eaa3abc285a988524d95e867285aad5d026a7 (diff)
[TIPC]: Fix 64-bit build warnings.
When storing u32 values in a pointer, need to do some long casts to keep GCC happy. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/subscr.c')
-rw-r--r--net/tipc/subscr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 451d875befcb..80e219ba527d 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -329,9 +329,10 @@ static void subscr_conn_shutdown_event(void *usr_handle,
329 unsigned int size, 329 unsigned int size,
330 int reason) 330 int reason)
331{ 331{
332 struct subscriber *subscriber = ref_lock((u32)usr_handle); 332 struct subscriber *subscriber;
333 spinlock_t *subscriber_lock; 333 spinlock_t *subscriber_lock;
334 334
335 subscriber = ref_lock((u32)(unsigned long)usr_handle);
335 if (subscriber == NULL) 336 if (subscriber == NULL)
336 return; 337 return;
337 338
@@ -350,9 +351,10 @@ static void subscr_conn_msg_event(void *usr_handle,
350 const unchar *data, 351 const unchar *data,
351 u32 size) 352 u32 size)
352{ 353{
353 struct subscriber *subscriber = ref_lock((u32)usr_handle); 354 struct subscriber *subscriber;
354 spinlock_t *subscriber_lock; 355 spinlock_t *subscriber_lock;
355 356
357 subscriber = ref_lock((u32)(unsigned long)usr_handle);
356 if (subscriber == NULL) 358 if (subscriber == NULL)
357 return; 359 return;
358 360
@@ -409,7 +411,7 @@ static void subscr_named_msg_event(void *usr_handle,
409 /* Establish a connection to subscriber */ 411 /* Establish a connection to subscriber */
410 412
411 tipc_createport(topsrv.user_ref, 413 tipc_createport(topsrv.user_ref,
412 (void *)subscriber->ref, 414 (void *)(unsigned long)subscriber->ref,
413 importance, 415 importance,
414 0, 416 0,
415 0, 417 0,