38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From b7ce12c46c3511b0752206fd6194ee982ab778b1 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 17 Jul 2011 21:41:35 +0200
|
|
Subject: [PATCH 227/304] debugobjects-rt.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
lib/debugobjects.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
|
|
index a78b7c6..9b622c9 100644
|
|
--- a/lib/debugobjects.c
|
|
+++ b/lib/debugobjects.c
|
|
@@ -306,7 +306,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);
|
|
|
|
@@ -1015,9 +1018,9 @@ static int __init debug_objects_replace_static_objects(void)
|
|
}
|
|
}
|
|
|
|
+ local_irq_enable();
|
|
printk(KERN_DEBUG "ODEBUG: %d of %d active objects replaced\n", cnt,
|
|
obj_pool_used);
|
|
- local_irq_enable();
|
|
return 0;
|
|
free:
|
|
hlist_for_each_entry_safe(obj, node, tmp, &objects, node) {
|