Merge tag 'core-debugobjects-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

f10bc401 · Linus Torvalds <[email protected]> · 2022-12-12 11:11:57 -08:00

Pull debugobjects update from Thomas Gleixner:
 "A single update for debugobjects:

  Add the object pointer to the debug output for better correlation with
  other debug facilities"

* tag 'core-debugobjects-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  debugobjects: Print object pointer in debug_print_object()

Commit: f10bc40168032962ebee26894bdbdc972cde35bf
Parents: 9c2b840a · c4db2d3b

Merge commit. Changes below are compared with the first parent: 9c2b840a.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
lib/debugobjects.c	modified	+2	−2	View file

lib/debugobjects.c

View file

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 337d797..4c670d3 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -500,9 +500,9 @@ static void debug_print_object(struct debug_obj *obj, char *msg)
 			descr->debug_hint(obj->object) : NULL;
 		limit++;
 		WARN(1, KERN_ERR "ODEBUG: %s %s (active state %u) "
-				 "object type: %s hint: %pS\n",
+				 "object: %p object type: %s hint: %pS\n",
 			msg, obj_states[obj->state], obj->astate,
-			descr->name, hint);
+			obj->object, descr->name, hint);
 	}
 	debug_objects_warnings++;
 }