Merge branch '4.0.8-rt6'

[zynq/linux.git] / include / linux / idr.h

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 013fd9bc4cb6cefb102705a88a6911de546acd0a..f62be0aec911de32e18849c31966f2e876e28d4d 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp);
  * Each idr_preload() should be matched with an invocation of this
  * function.  See idr_preload() for details.
  */
+#ifdef CONFIG_PREEMPT_RT_FULL
+void idr_preload_end(void);
+#else
 static inline void idr_preload_end(void)
 {
        preempt_enable();
 }
+#endif
 
 /**
  * idr_find - return pointer for given id