summaryrefslogtreecommitdiffstats
path: root/lib/debugobjects.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-05-18 16:20:19 +0200
committerLinus Torvalds2010-05-18 16:20:19 +0200
commit06ee772043c7ad125f2c2e6a08dc563706f39e8d (patch)
tree36575def46dbf339c91bcfdf34737f81d887b1fc /lib/debugobjects.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
parentdebugobjects: Section mismatch cleanup (diff)
downloadkernel-qcow2-linux-06ee772043c7ad125f2c2e6a08dc563706f39e8d.tar.gz
kernel-qcow2-linux-06ee772043c7ad125f2c2e6a08dc563706f39e8d.tar.xz
kernel-qcow2-linux-06ee772043c7ad125f2c2e6a08dc563706f39e8d.zip
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/debugobjects.c')
-rw-r--r--lib/debugobjects.c4
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)
}
}
-static int
+static int __init
check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
{
struct debug_bucket *db;
@@ -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;