diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 00:25:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 15:27:07 -0700 |
| commit | f20dc5f7c1adf1c4b68b7672d6f2002cb824e636 (patch) | |
| tree | ffd31717399ff783da29444f3446a63285f22b14 | |
| parent | eb4542b98c81e22e08587b747b21986a45360999 (diff) | |
| download | op-kernel-dev-f20dc5f7c1adf1c4b68b7672d6f2002cb824e636.zip op-kernel-dev-f20dc5f7c1adf1c4b68b7672d6f2002cb824e636.tar.gz | |
[PATCH] lockdep: annotate mm
Teach special (recursive) locking code to the lock validator. Has no effect
on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/memory.c | 2 | ||||
| -rw-r--r-- | mm/mremap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7e2a4b1..c1e14c9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -503,7 +503,7 @@ again: return -ENOMEM; src_pte = pte_offset_map_nested(src_pmd, addr); src_ptl = pte_lockptr(src_mm, src_pmd); - spin_lock(src_ptl); + spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING); do { /* diff --git a/mm/mremap.c b/mm/mremap.c index 1903bdf..7c15cf3 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -97,7 +97,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, new_pte = pte_offset_map_nested(new_pmd, new_addr); new_ptl = pte_lockptr(mm, new_pmd); if (new_ptl != old_ptl) - spin_lock(new_ptl); + spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING); for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE, new_pte++, new_addr += PAGE_SIZE) { |
