diff options
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/kernel/futex.c b/kernel/futex.c index ca05fe6a70b2..3b4d5ad44cc6 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -205,15 +205,13 @@ static int get_futex_key(unsigned long uaddr, union futex_key *key) | |||
| 205 | /* | 205 | /* | 
| 206 | * Do a quick atomic lookup first - this is the fastpath. | 206 | * Do a quick atomic lookup first - this is the fastpath. | 
| 207 | */ | 207 | */ | 
| 208 | spin_lock(¤t->mm->page_table_lock); | 208 | page = follow_page(mm, uaddr, FOLL_TOUCH|FOLL_GET); | 
| 209 | page = follow_page(mm, uaddr, 0); | ||
| 210 | if (likely(page != NULL)) { | 209 | if (likely(page != NULL)) { | 
| 211 | key->shared.pgoff = | 210 | key->shared.pgoff = | 
| 212 | page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); | 211 | page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); | 
| 213 | spin_unlock(¤t->mm->page_table_lock); | 212 | put_page(page); | 
| 214 | return 0; | 213 | return 0; | 
| 215 | } | 214 | } | 
| 216 | spin_unlock(¤t->mm->page_table_lock); | ||
| 217 | 215 | ||
| 218 | /* | 216 | /* | 
| 219 | * Do it the general way. | 217 | * Do it the general way. | 
