diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 19:33:18 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:06 (GMT) |
| commit | 2fcb0c5fbaadc0ca305870e5e29304d2d46de71c (patch) | |
| tree | fe339e041ca06252227b96cfb813c8b9af91fd47 /include/linux | |
| parent | ec38a4cc4dac0fd38896becd618319bc5c48344f (diff) | |
| download | linux-fsl-qoriq-2fcb0c5fbaadc0ca305870e5e29304d2d46de71c.tar.xz | |
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/radix-tree.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index 4039407..5b6d5b2 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -230,8 +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); int radix_tree_maybe_preload(gfp_t gfp_mask); +#else +static inline int radix_tree_preload(gfp_t gm) { return 0; } +static inline int radix_tree_maybe_preload(gfp_t gfp_mask) { return 0; } +#endif void radix_tree_init(void); void *radix_tree_tag_set(struct radix_tree_root *root, unsigned long index, unsigned int tag); @@ -256,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(); } /** |