summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-27 01:50:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:16 -0700
commit09b185a3169c5a8f9b7baf97f16d32add7e10ca4 (patch)
treee4cb09d6ea4638513c6f2cb14de26b1397628deb
parenta8b4fc4d7c3ccf80d4fa1805cee85c06c2aa653e (diff)
downloadop-kernel-dev-09b185a3169c5a8f9b7baf97f16d32add7e10ca4.zip
op-kernel-dev-09b185a3169c5a8f9b7baf97f16d32add7e10ca4.tar.gz
[PATCH] uml: fix gcov support
Make __bb_init_func weak in order to avoid a link failure with some libcs and/or gccs. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/um/kernel/gmon_syms.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/um/kernel/gmon_syms.c b/arch/um/kernel/gmon_syms.c
index 2c86e7f..13aa115 100644
--- a/arch/um/kernel/gmon_syms.c
+++ b/arch/um/kernel/gmon_syms.c
@@ -5,7 +5,7 @@
#include "linux/module.h"
-extern void __bb_init_func(void *);
+extern void __bb_init_func(void *) __attribute__((weak));
EXPORT_SYMBOL(__bb_init_func);
/* This is defined (and referred to in profiling stub code) only by some GCC
@@ -21,14 +21,3 @@ EXPORT_SYMBOL(__gcov_init);
extern void __gcov_merge_add(void *) __attribute__((weak));
EXPORT_SYMBOL(__gcov_merge_add);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
OpenPOWER on IntegriCloud