summaryrefslogtreecommitdiffstats
path: root/net/tipc/subscr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 22:22:32 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 23:06:41 +0100
commit880b005f294454d989783d0984dc554dfe3c8214 (patch)
treed1cffd5367f0bc939ef6952f6dacd78fb8592f39 /net/tipc/subscr.c
parent[TIPC] Added entry for TIPC in MAINTAINERS (diff)
downloadlinux-880b005f294454d989783d0984dc554dfe3c8214.tar.xz
linux-880b005f294454d989783d0984dc554dfe3c8214.zip
[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,
unsigned int size,
int reason)
{
- struct subscriber *subscriber = ref_lock((u32)usr_handle);
+ struct subscriber *subscriber;
spinlock_t *subscriber_lock;
+ subscriber = ref_lock((u32)(unsigned long)usr_handle);
if (subscriber == NULL)
return;
@@ -350,9 +351,10 @@ static void subscr_conn_msg_event(void *usr_handle,
const unchar *data,
u32 size)
{
- struct subscriber *subscriber = ref_lock((u32)usr_handle);
+ struct subscriber *subscriber;
spinlock_t *subscriber_lock;
+ subscriber = ref_lock((u32)(unsigned long)usr_handle);
if (subscriber == NULL)
return;
@@ -409,7 +411,7 @@ static void subscr_named_msg_event(void *usr_handle,
/* Establish a connection to subscriber */
tipc_createport(topsrv.user_ref,
- (void *)subscriber->ref,
+ (void *)(unsigned long)subscriber->ref,
importance,
0,
0,