diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 19:33:18 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:17 (GMT) |
| commit | 2c48e85a65779ca18b7fdc4a2218662b8a96f81d (patch) | |
| tree | b39a8ca6d1741c3c9cb22619f8fef4fae0b7682b /include/linux/radix-tree.h | |
| parent | 2b9dfcb4573cdfafe60172a19d8779b92010873f (diff) | |
| download | linux-fsl-qoriq-2c48e85a65779ca18b7fdc4a2218662b8a96f81d.tar.xz | |
radix-tree-rt-aware.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/radix-tree.h')
| -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 ffc444c..7ddfbf9 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(); } /** |