diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:54:20 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:54:20 +0900 |
| commit | b1386cedda177b10fac009ca8d3681034f15b5b3 (patch) | |
| tree | e979766970249b4cf3b1bae41a91ee7430041bd8 /include/linux/radix-tree.h | |
| parent | d15ae814ccb0df179e93d64c4642e7f58ee8398b (diff) | |
| parent | 368301f2fe4b07e5fb71dba3cc566bc59eb6705f (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Five fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
pps: do not crash when failed to register
tools/vm/slabinfo: fix an unintentional printf
testing/radix-tree: fix a macro expansion bug
radix-tree: fix radix_tree_iter_retry() for tagged iterators.
mm: memcontrol: fix cgroup creation failure after many small jobs
Diffstat (limited to 'include/linux/radix-tree.h')
| -rw-r--r-- | include/linux/radix-tree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index cb4b7e8cee81..eca6f626c16e 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -407,6 +407,7 @@ static inline __must_check void **radix_tree_iter_retry(struct radix_tree_iter *iter) { iter->next_index = iter->index; + iter->tags = 0; return NULL; } |