Commit 18a06efa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

Single fix for a commit from the first batch of patches through Andrew.

* emailed from Andrew Morton <akpm@linux-foundation.org>:
  pagemap: remove remaining unneeded spin_lock()
parents 0a03726c 10bdfb5e

fs/proc/task_mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -783,7 +783,6 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 


	/* find the first VMA at or above 'addr' */

	vma = find_vma(walk->mm, addr);

	spin_lock(&walk->mm->page_table_lock);

	if (pmd_trans_huge_lock(pmd, vma) == 1) {

		for (; addr != end; addr += PAGE_SIZE) {

			unsigned long offset;