Merge branch 'linus' into core/urgent

[pandora-kernel.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 70bb54b..11cbe05 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -384,8 +384,8 @@ static int fault_in_user_writeable(u32 __user *uaddr)
        int ret;
 
        down_read(&mm->mmap_sem);
        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;
        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++) {
                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);
        }
 
                spin_lock_init(&futex_queues[i].lock);
        }