diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:33:18 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:45:58 -0400 |
| commit | a2e958aa74b5489f396d615296389ad3e846645d (patch) | |
| tree | 2136f6a114b9bf656fe792ecf8d91385f9842d16 /include | |
| parent | 7ac9bc668847e0a53f04dcb714ad31f38d5da0b2 (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 9d4539c52e53..6b4bdf2097dd 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -231,7 +231,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); @@ -256,7 +262,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(); } #endif /* _LINUX_RADIX_TREE_H */ |