diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /lib | |
parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/radix-tree.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 8d3fb0bd1288..4bb42a0344ec 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
@@ -640,13 +640,14 @@ EXPORT_SYMBOL(radix_tree_tag_get); | |||
640 | * | 640 | * |
641 | * Returns: the index of the hole if found, otherwise returns an index | 641 | * Returns: the index of the hole if found, otherwise returns an index |
642 | * outside of the set specified (in which case 'return - index >= max_scan' | 642 | * outside of the set specified (in which case 'return - index >= max_scan' |
643 | * will be true). | 643 | * will be true). In rare cases of index wrap-around, 0 will be returned. |
644 | * | 644 | * |
645 | * radix_tree_next_hole may be called under rcu_read_lock. However, like | 645 | * radix_tree_next_hole may be called under rcu_read_lock. However, like |
646 | * radix_tree_gang_lookup, this will not atomically search a snapshot of the | 646 | * radix_tree_gang_lookup, this will not atomically search a snapshot of |
647 | * tree at a single point in time. For example, if a hole is created at index | 647 | * the tree at a single point in time. For example, if a hole is created |
648 | * 5, then subsequently a hole is created at index 10, radix_tree_next_hole | 648 | * at index 5, then subsequently a hole is created at index 10, |
649 | * covering both indexes may return 10 if called under rcu_read_lock. | 649 | * radix_tree_next_hole covering both indexes may return 10 if called |
650 | * under rcu_read_lock. | ||
650 | */ | 651 | */ |
651 | unsigned long radix_tree_next_hole(struct radix_tree_root *root, | 652 | unsigned long radix_tree_next_hole(struct radix_tree_root *root, |
652 | unsigned long index, unsigned long max_scan) | 653 | unsigned long index, unsigned long max_scan) |