summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-01-31 15:08:43 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 15:09:14 +0100
commit51563cd53c4b1c1790fccd2e0af0e2b756589af9 (patch)
treed2fedfc654ab4fa011feaca262f95481a89e232a /lib
parentd123375425d7df4b6081a631fc1203fceafa59b2 (diff)
parent8161239a8bcce9ad6b537c04a1fa3b5c68bae693 (diff)
downloadlinux-stable-51563cd53c4b1c1790fccd2e0af0e2b756589af9.tar.gz
linux-stable-51563cd53c4b1c1790fccd2e0af0e2b756589af9.tar.bz2
linux-stable-51563cd53c4b1c1790fccd2e0af0e2b756589af9.zip
Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking
*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex: rtmutex: Simplify PI algorithm and make highest prio task get lock
Diffstat (limited to 'lib')
-rw-r--r--lib/radix-tree.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 5086bb962b4d..7ea2e033d715 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -736,10 +736,11 @@ next:
}
}
/*
- * The iftag must have been set somewhere because otherwise
- * we would return immediated at the beginning of the function
+ * We need not to tag the root tag if there is no tag which is set with
+ * settag within the range from *first_indexp to last_index.
*/
- root_tag_set(root, settag);
+ if (tagged > 0)
+ root_tag_set(root, settag);
*first_indexp = index;
return tagged;