summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 19:33:18 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:38:06 (GMT)
commit2fcb0c5fbaadc0ca305870e5e29304d2d46de71c (patch)
treefe339e041ca06252227b96cfb813c8b9af91fd47 /lib
parentec38a4cc4dac0fd38896becd618319bc5c48344f (diff)
downloadlinux-fsl-qoriq-2fcb0c5fbaadc0ca305870e5e29304d2d46de71c.tar.xz
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/radix-tree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 7811ed3..e7b61e8 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -221,12 +221,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);
@@ -261,6 +262,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
@@ -326,6 +328,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
return 0;
}
EXPORT_SYMBOL(radix_tree_maybe_preload);
+#endif
/*
* Return the maximum key which can be store into a