diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:08:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:08:07 -0700 |
| commit | 6ba1c700230f1e9cadd5abb15edba8573c0de40e (patch) | |
| tree | 9a51a553382574b59d343c837934683764a2e241 /kernel/futex.c | |
| parent | d2c3c40789e6645e40c8538182acf7a6831d1db3 (diff) | |
| parent | 94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff) | |
| download | kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.zip kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.gz kernel_samsung_tuna-6ba1c700230f1e9cadd5abb15edba8573c0de40e.tar.bz2 | |
Merge commit 'v3.0.1' into linux-omap-3.0
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 3fbc76c..0a30897 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -355,8 +355,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; |