diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-10-26 23:21:59 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 01:52:09 +0200 |
commit | 25ca1d6c02fe1c6d90d918867ef670d323725458 (patch) | |
tree | de1709dd1dc7e0b9e9bd91840beb02f12e56b7e0 /mm | |
parent | mm: add casts to/from gfp_t in gfp_to_alloc_flags() (diff) | |
download | linux-25ca1d6c02fe1c6d90d918867ef670d323725458.tar.xz linux-25ca1d6c02fe1c6d90d918867ef670d323725458.zip |
mm: wrap get_locked_pte() using __cond_lock()
The get_locked_pte() conditionally grabs 'ptl' in case of returning
non-NULL. This leads sparse to complain about context imbalance. Rename
and wrap it using __cond_lock() to make sparse happy.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 714c4438d887..4ce24a4d5d48 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1591,7 +1591,7 @@ struct page *get_dump_page(unsigned long addr) } #endif /* CONFIG_ELF_CORE */ -pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, +pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl) { pgd_t * pgd = pgd_offset(mm, addr); |