Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / include / linux / debugobjects.h

diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h
index 98ffcbd4888ea0d088f2d4e8c4b41757b0e472c2..46056cb161fce0e1f3de707d887abd2ffcb1d02b 100644 (file)
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
@@ -38,8 +38,10 @@ struct debug_obj {
  * @name:              name of the object typee
  * @debug_hint:                function returning address, which have associated
  *                     kernel symbol, to allow identify the object
+ * @is_static_object   return true if the obj is static, otherwise return false
  * @fixup_init:                fixup function, which is called when the init check
- *                     fails
+ *                     fails. All fixup functions must return true if fixup
+ *                     was successful, otherwise return false
  * @fixup_activate:    fixup function, which is called when the activate check
  *                     fails
  * @fixup_destroy:     fixup function, which is called when the destroy check
@@ -51,12 +53,13 @@ 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);
-       int (*fixup_free)       (void *addr, enum debug_obj_state state);
-       int (*fixup_assert_init)(void *addr, enum debug_obj_state state);
+       void *(*debug_hint)(void *addr);
+       bool (*is_static_object)(void *addr);
+       bool (*fixup_init)(void *addr, enum debug_obj_state state);
+       bool (*fixup_activate)(void *addr, enum debug_obj_state state);
+       bool (*fixup_destroy)(void *addr, enum debug_obj_state state);
+       bool (*fixup_free)(void *addr, enum debug_obj_state state);
+       bool (*fixup_assert_init)(void *addr, enum debug_obj_state state);
 };
 
 #ifdef CONFIG_DEBUG_OBJECTS