Merge commit 'v2.6.39' into 20110526

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c

1 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h
index 597692f1fc8d..65970b811e22 100644
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
@@ -34,7 +34,10 @@ struct debug_obj {
 
 /**
  * struct debug_obj_descr - object type specific debug description structure
+ *
  * @name:               name of the object typee
+ * @debug_hint:         function returning address, which have associated
+ *                      kernel symbol, to allow identify the object
  * @fixup_init:         fixup function, which is called when the init check
  *                      fails
  * @fixup_activate:     fixup function, which is called when the activate check
@@ -46,7 +49,7 @@ struct debug_obj {
  */
 struct debug_obj_descr {
         const char              *name;
-
+        void *(*debug_hint)     (void *addr);
         int (*fixup_init)       (void *addr, enum debug_obj_state state);
         int (*fixup_activate)   (void *addr, enum debug_obj_state state);
         int (*fixup_destroy)    (void *addr, enum debug_obj_state state);