diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:07:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:07:08 -0700 |
| commit | 18a06efae5b37bf5cb7473b5ba91a50907a8f7ac (patch) | |
| tree | 4506ce1c713a370af739bec8b890f93ad51a2c84 /fs/proc | |
| parent | 0a03726ca982129b1e054f0e8c34ca7eea348acd (diff) | |
| parent | 10bdfb5ef7e1a429a3de31e498942a8ae5749a46 (diff) | |
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()
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/task_mmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c283832d411..2b9a7607cbd 100644 --- a/fs/proc/task_mmu.c +++ b/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' */ 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; |