summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0194-debugobjects-Make-RT-aware.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0194-debugobjects-Make-RT-aware.patch27
1 files changed, 12 insertions, 15 deletions
diff --git a/debian/patches-rt/0194-debugobjects-Make-RT-aware.patch b/debian/patches-rt/0194-debugobjects-Make-RT-aware.patch
index 9603d8e8d..ec8411674 100644
--- a/debian/patches-rt/0194-debugobjects-Make-RT-aware.patch
+++ b/debian/patches-rt/0194-debugobjects-Make-RT-aware.patch
@@ -1,28 +1,25 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 17 Jul 2011 21:41:35 +0200
Subject: [PATCH 194/353] debugobjects: Make RT aware
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=ea8b8fccf490497fd4c70ae38e1d97c32676ac45
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=b56a11fdddede9388a998f84bc84f86f0ed9197e
Avoid filling the pool / allocating memory with irqs off().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
- lib/debugobjects.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ lib/debugobjects.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index 14afeeb7d6ef..e28481c402ae 100644
+index 5f23d896df55..e486693aea49 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
-@@ -376,7 +376,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);
+@@ -466,7 +466,7 @@ static void debug_objects_fill_pool(void)
+ * On RT enabled kernels the pool refill must happen in preemptible
+ * context:
+ */
+- if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible())
++ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) || preemptible())
+ fill_pool();
+ }