diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:33:18 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:40:26 -0500 |
| commit | a7e14d612d29414796b4cdde9b0711c90a0174b9 (patch) | |
| tree | 7e99b2c3beba8b6b88c5d4fc6088c07a569ed564 | |
| parent | 20c7505bfd3a8402e73f4146d5c109fb184bebd0 (diff) | |
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/radix-tree.h | 8 | ||||
| -rw-r--r-- | lib/radix-tree.c | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index 0d04cd69ab9b..d94fc30cce7f 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -230,7 +230,13 @@ unsigned long radix_tree_next_hole(struct radix_tree_root *root, unsigned long index, unsigned long max_scan); unsigned long radix_tree_prev_hole(struct radix_tree_root *root, unsigned long index, unsigned long max_scan); + +#ifndef CONFIG_PREEMPT_RT_FULL int radix_tree_preload(gfp_t gfp_mask); +#else +static inline int radix_tree_preload(gfp_t gm) { return 0; } +#endif + void radix_tree_init(void); void *radix_tree_tag_set(struct radix_tree_root *root, unsigned long index, unsigned int tag); @@ -255,7 +261,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item); static inline void radix_tree_preload_end(void) { - preempt_enable(); + preempt_enable_nort(); } /** diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 86516f5588e3..bfd5a2e9785d 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -202,12 +202,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); @@ -242,6 +243,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 @@ -276,6 +278,7 @@ out: return ret; } EXPORT_SYMBOL(radix_tree_preload); +#endif /* * Return the maximum key which can be store into a |