diff options
| author | Greg Kroah-Hartman | 2013-04-14 18:21:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-04-14 18:21:35 -0700 |
| commit | 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17 (patch) | |
| tree | e3d511aca536b7123d256b98a0ef8e74fc219498 /mm/nommu.c | |
| parent | a7761027656dc192b59617a6eb961e38097419ce (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
Merge 3.9-rc7 into char-misc-next
We want the fixes in there.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index e19328087534..2f3ea749c318 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -821,7 +821,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) struct vm_area_struct *vma; /* check the cache first */ - vma = mm->mmap_cache; + vma = ACCESS_ONCE(mm->mmap_cache); if (vma && vma->vm_start <= addr && vma->vm_end > addr) return vma; |