Skip to content
Snippets Groups Projects
Commit 910d5388 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi
Browse files

futex2: Fix compilation warnings


/home/krisman/linux-tmp/kernel/futex2.c: In function
‘futex_get_shared_key’: /home/krisman/linux-tmp/kernel/futex2.c:156:6: warning: unused variable ‘ret’ [-Wunused-variable]
int ret, err;
    ^~~
/home/krisman/linux-tmp/kernel/futex2.c: In function
‘__do_sys_futex_wait’: /home/krisman/linux-tmp/kernel/futex2.c:561:16:
warning: assignment to ‘uintptr_t’ {aka ‘long unsigned int’} from
‘void *’ makes integer from pointer without a cast [-Wint-conversion]
waiter->uaddr = uaddr;
		^
/home/krisman/linux-tmp/kernel/futex2.c: In function
‘futex_parse_waitv’: /home/krisman/linux-tmp/kernel/futex2.c:620:28:
warning: assignment to ‘uintptr_t’ {aka ‘long unsigned int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
futexv->objects[i].uaddr = waitv.uaddr;

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
parent e6ba9036
No related branches found
No related tags found
No related merge requests found
......@@ -153,7 +153,7 @@ static u64 get_inode_sequence_number(struct inode *inode)
static int futex_get_shared_key(uintptr_t address, struct mm_struct *mm,
struct futex_key *key)
{
int ret, err;
int err;
struct page *page, *tail;
struct address_space *mapping;
......@@ -558,7 +558,7 @@ SYSCALL_DEFINE4(futex_wait, void __user *, uaddr, unsigned int, val,
waiter = &wait_single.waiter;
waiter->index = 0;
waiter->val = val;
waiter->uaddr = uaddr;
waiter->uaddr = (uintptr_t) uaddr;
INIT_LIST_HEAD(&waiter->list);
......@@ -617,7 +617,7 @@ static int futex_parse_waitv(struct futexv *futexv,
futexv->objects[i].flags = waitv.flags;
futexv->objects[i].index = i;
INIT_LIST_HEAD(&futexv->objects[i].list);
futexv->objects[i].uaddr = waitv.uaddr;
futexv->objects[i].uaddr = (uintptr_t) waitv.uaddr;
}
return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment