diff options
| author | Alex Shi <alex.shi@linaro.org> | 2013-12-23 10:54:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2013-12-23 10:54:59 +0800 |
| commit | abc5c8153c473f352bbc6eccfb016564a1b58b7e (patch) | |
| tree | 3d5b999e02a8136998d72eb60df923ed81793a69 /kernel/futex.c | |
| parent | 188c91c2f4c54d8265ed947886ec1bbcf8f24e99 (diff) | |
| parent | 3c6556b1a9c2f9c91aacbc57bac938691fedda81 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index c3a1a55a521..221a58fc62f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -288,7 +288,7 @@ again: put_page(page); /* serialize against __split_huge_page_splitting() */ local_irq_disable(); - if (likely(__get_user_pages_fast(address, 1, 1, &page) == 1)) { + if (likely(__get_user_pages_fast(address, 1, !ro, &page) == 1)) { page_head = compound_head(page); /* * page_head is valid pointer but we must pin |