diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
| commit | c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7 (patch) | |
| tree | 1817910408fa7b5027e463725a6eb54933c71928 /lib/radix-tree.c | |
| parent | uprobes: Pass probed vaddr to arch_uprobe_analyze_insn() (diff) | |
| parent | Linux 3.5-rc2 (diff) | |
| download | wireguard-linux-c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7.tar.xz wireguard-linux-c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7.zip | |
Merge tag 'v3.5-rc2' into perf/core
Merge in Linux 3.5-rc2 - to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/radix-tree.c')
| -rw-r--r-- | lib/radix-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index d7c878cc006c..e7964296fd50 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -686,6 +686,9 @@ void **radix_tree_next_chunk(struct radix_tree_root *root, * during iterating; it can be zero only at the beginning. * And we cannot overflow iter->next_index in a single step, * because RADIX_TREE_MAP_SHIFT < BITS_PER_LONG. + * + * This condition also used by radix_tree_next_slot() to stop + * contiguous iterating, and forbid swithing to the next chunk. */ index = iter->next_index; if (!index && iter->index) |