forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into core/urgent

Browse source
This commit is contained in:
Ingo Molnar 2011-08-04 09:09:27 +02:00
commit d7619fe39d
7972 changed files with 484903 additions and 374724 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/futex.c
View file

@ -384,8 +384,8 @@ static int fault_in_user_writeable(u32 __user *uaddr)
int ret;
down_read(&mm->mmap_sem);
ret = get_user_pages(current, mm, (unsigned long)uaddr,
1, 1, 0, NULL, NULL);
ret = fixup_user_fault(current, mm, (unsigned long)uaddr,
FAULT_FLAG_WRITE);
up_read(&mm->mmap_sem);
return ret < 0 ? ret : 0;
@ -2727,7 +2727,7 @@ static int __init futex_init(void)
futex_cmpxchg_enabled = 1;
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
plist_head_init(&futex_queues[i].chain);
spin_lock_init(&futex_queues[i].lock);
}