aboutsummaryrefslogtreecommitdiffstats
path: root/lib/debugobjects.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2021-10-06 07:55:44 +0300
committerTony Lindgren <tony@atomide.com>2021-10-06 07:55:44 +0300
commite700ac213a0f793fb4f83098413303e3dd080892 (patch)
tree52130e5a24ec9ea55b2f81899b8a45bed0f17f7c /lib/debugobjects.c
parentbus: ti-sysc: Add break in switch statement in sysc_init_soc() (diff)
parentsoc: ti: omap-prm: Fix external abort for am335x pruss (diff)
downloadlinux-dev-e700ac213a0f793fb4f83098413303e3dd080892.tar.xz
linux-dev-e700ac213a0f793fb4f83098413303e3dd080892.zip
Merge branch 'pruss-fix' into fixes
Merge in a fix for pruss reset issue caused by enabling pruss for am335x.
Diffstat (limited to 'lib/debugobjects.c')
-rw-r--r--lib/debugobjects.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 9e14ae02306b..6946f8e204e3 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -557,7 +557,12 @@ __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstack
struct debug_obj *obj;
unsigned long flags;
- fill_pool();
+ /*
+ * On RT enabled kernels the pool refill must happen in preemptible
+ * context:
+ */
+ if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible())
+ fill_pool();
db = get_bucket((unsigned long) addr);