Browse Source

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()
Linus Torvalds 13 năm trước cách đây
mục cha
commit
18a06efae5
1 tập tin đã thay đổi với 0 bổ sung1 xóa
  1. 0 1
      fs/proc/task_mmu.c

+ 0 - 1
fs/proc/task_mmu.c

@@ -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' */
 	/* find the first VMA at or above 'addr' */
 	vma = find_vma(walk->mm, addr);
 	vma = find_vma(walk->mm, addr);
-	spin_lock(&walk->mm->page_table_lock);
 	if (pmd_trans_huge_lock(pmd, vma) == 1) {
 	if (pmd_trans_huge_lock(pmd, vma) == 1) {
 		for (; addr != end; addr += PAGE_SIZE) {
 		for (; addr != end; addr += PAGE_SIZE) {
 			unsigned long offset;
 			unsigned long offset;