diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 10:20:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 10:20:19 -0400 |
| commit | 06ee772043c7ad125f2c2e6a08dc563706f39e8d (patch) | |
| tree | 36575def46dbf339c91bcfdf34737f81d887b1fc /lib | |
| parent | fd25a1f556760dbd6e29dec66c70223a8912cdb2 (diff) | |
| parent | 1fb2f77c037624601fd214fb7c29faa84cd7bdd7 (diff) | |
Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
debugobjects: Section mismatch cleanup
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/debugobjects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index b862b30369ff..bf007a43c053 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
| @@ -774,7 +774,7 @@ static int __init fixup_free(void *addr, enum debug_obj_state state) | |||
| 774 | } | 774 | } |
| 775 | } | 775 | } |
| 776 | 776 | ||
| 777 | static int | 777 | static int __init |
| 778 | check_results(void *addr, enum debug_obj_state state, int fixups, int warnings) | 778 | check_results(void *addr, enum debug_obj_state state, int fixups, int warnings) |
| 779 | { | 779 | { |
| 780 | struct debug_bucket *db; | 780 | struct debug_bucket *db; |
| @@ -917,7 +917,7 @@ void __init debug_objects_early_init(void) | |||
| 917 | /* | 917 | /* |
| 918 | * Convert the statically allocated objects to dynamic ones: | 918 | * Convert the statically allocated objects to dynamic ones: |
| 919 | */ | 919 | */ |
| 920 | static int debug_objects_replace_static_objects(void) | 920 | static int __init debug_objects_replace_static_objects(void) |
| 921 | { | 921 | { |
| 922 | struct debug_bucket *db = obj_hash; | 922 | struct debug_bucket *db = obj_hash; |
| 923 | struct hlist_node *node, *tmp; | 923 | struct hlist_node *node, *tmp; |