diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /lib/debugobjects.c | |
parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'lib/debugobjects.c')
-rw-r--r-- | lib/debugobjects.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index deebcc57d4e..9d86e45086f 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -249,14 +249,17 @@ static struct debug_bucket *get_bucket(unsigned long addr) static void debug_print_object(struct debug_obj *obj, char *msg) { + struct debug_obj_descr *descr = obj->descr; static int limit; - if (limit < 5 && obj->descr != descr_test) { + if (limit < 5 && descr != descr_test) { + void *hint = descr->debug_hint ? + descr->debug_hint(obj->object) : NULL; limit++; WARN(1, KERN_ERR "ODEBUG: %s %s (active state %u) " - "object type: %s\n", + "object type: %s hint: %pS\n", msg, obj_states[obj->state], obj->astate, - obj->descr->name); + descr->name, hint); } debug_objects_warnings++; } |