diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
| commit | 43cdd088b1b10306d4eb6d9208b62c7f60abffeb (patch) | |
| tree | 8dd799379a241c1b47b736299c306eb77f06e6ff /include/linux/debugobjects.h | |
| parent | bf69aa906ccddacc9e966794869431374953738a (diff) | |
| parent | 4028b6c4c03f213260e9290ff3a6b5439aad07ce (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/debugobjects.h')
| -rw-r--r-- | include/linux/debugobjects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h index 0e5f5785d9f2..98ffcbd4888e 100644 --- a/include/linux/debugobjects.h +++ b/include/linux/debugobjects.h @@ -63,7 +63,7 @@ struct debug_obj_descr { extern void debug_object_init (void *addr, struct debug_obj_descr *descr); extern void debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr); -extern void debug_object_activate (void *addr, struct debug_obj_descr *descr); +extern int debug_object_activate (void *addr, struct debug_obj_descr *descr); extern void debug_object_deactivate(void *addr, struct debug_obj_descr *descr); extern void debug_object_destroy (void *addr, struct debug_obj_descr *descr); extern void debug_object_free (void *addr, struct debug_obj_descr *descr); @@ -85,8 +85,8 @@ static inline void debug_object_init (void *addr, struct debug_obj_descr *descr) { } static inline void debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr) { } -static inline void -debug_object_activate (void *addr, struct debug_obj_descr *descr) { } +static inline int +debug_object_activate (void *addr, struct debug_obj_descr *descr) { return 0; } static inline void debug_object_deactivate(void *addr, struct debug_obj_descr *descr) { } static inline void |