diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:33:18 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-02-07 12:28:55 -0500 |
commit | 906ce1f38f1e9279c99e43cf1597a3b391c36401 (patch) | |
tree | 69269f8ea49f54c0cf7abd47608291f66138dedb /lib/radix-tree.c | |
parent | 37b2bc862e5406569ca7ee55b1c596d027bfdaa3 (diff) |
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'lib/radix-tree.c')
-rw-r--r-- | lib/radix-tree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 7ea2e033d715..205adb8fe9f5 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -166,12 +166,13 @@ radix_tree_node_alloc(struct radix_tree_root *root) * succeed in getting a node here (and never reach * kmem_cache_alloc) */ - rtp = &__get_cpu_var(radix_tree_preloads); + rtp = &get_cpu_var(radix_tree_preloads); if (rtp->nr) { ret = rtp->nodes[rtp->nr - 1]; rtp->nodes[rtp->nr - 1] = NULL; rtp->nr--; } + put_cpu_var(radix_tree_preloads); } if (ret == NULL) ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); @@ -206,6 +207,7 @@ radix_tree_node_free(struct radix_tree_node *node) call_rcu(&node->rcu_head, radix_tree_node_rcu_free); } +#ifndef CONFIG_PREEMPT_RT_FULL /* * Load up this CPU's radix_tree_node buffer with sufficient objects to * ensure that the addition of a single element in the tree cannot fail. On @@ -240,6 +242,7 @@ out: return ret; } EXPORT_SYMBOL(radix_tree_preload); +#endif /* * Return the maximum key which can be store into a |