Skip to content

Commit

Permalink
Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pu…
Browse files Browse the repository at this point in the history
…b/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
  • Loading branch information
torvalds committed May 18, 2010
2 parents fd25a1f + 1fb2f77 commit 06ee772
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/debugobjects.c
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ static int __init fixup_free(void *addr, enum debug_obj_state state)
}
}

static int
static int __init
check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
{
struct debug_bucket *db;
Expand Down Expand Up @@ -917,7 +917,7 @@ void __init debug_objects_early_init(void)
/*
* Convert the statically allocated objects to dynamic ones:
*/
static int debug_objects_replace_static_objects(void)
static int __init debug_objects_replace_static_objects(void)
{
struct debug_bucket *db = obj_hash;
struct hlist_node *node, *tmp;
Expand Down

0 comments on commit 06ee772

Please sign in to comment.