Merge branch '4.0.8-rt6'

[zynq/linux.git] / lib / debugobjects.c

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 547f7f923dbcbd24f8bb99e13ef7c13db947b8dd..8fcdbc2fc6d06cc30ea58e8bd5ccc82ac7ec3bdd 100644 (file)
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -309,7 +309,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
        struct debug_obj *obj;
        unsigned long flags;
 
-       fill_pool();
+#ifdef CONFIG_PREEMPT_RT_FULL
+       if (preempt_count() == 0 && !irqs_disabled())
+#endif
+               fill_pool();
 
        db = get_bucket((unsigned long) addr);