diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:33:18 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:29:33 +0100 |
| commit | 63a2a57a386b9c4ac6889b76aee7616f368779b1 (patch) | |
| tree | 0303fe23ea92b6355d3d975db48444285778c848 /include | |
| parent | 3ccf5fbeb74d25b5af1cfe83c1319b2e2457d623 (diff) | |
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/radix-tree.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index ffc444c38b0a..7ddfbf97e32d 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(); } /** |