diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
| commit | a61944c251c3e68c4bbf6eb96ff61c7b286351c5 (patch) | |
| tree | fd9f82297805d043a45a828626dfd29bddc48b00 /mm/filemap_xip.c | |
| parent | ac9a126571e76abec76e1c1f46672e82501eab1e (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
| download | op-kernel-dev-a61944c251c3e68c4bbf6eb96ff61c7b286351c5.zip op-kernel-dev-a61944c251c3e68c4bbf6eb96ff61c7b286351c5.tar.gz | |
Merge commit 'v3.0-rc1' into kbuild/kconfig
Diffstat (limited to 'mm/filemap_xip.c')
| -rw-r--r-- | mm/filemap_xip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 83364df..93356cd 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c @@ -183,7 +183,7 @@ __xip_unmap (struct address_space * mapping, return; retry: - spin_lock(&mapping->i_mmap_lock); + mutex_lock(&mapping->i_mmap_mutex); vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) { mm = vma->vm_mm; address = vma->vm_start + @@ -201,7 +201,7 @@ retry: page_cache_release(page); } } - spin_unlock(&mapping->i_mmap_lock); + mutex_unlock(&mapping->i_mmap_mutex); if (locked) { mutex_unlock(&xip_sparse_mutex); |
