diff options
author | Peter Oberparleiter <oberpar@linux.vnet.ibm.com> | 2009-06-17 19:28:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 16:03:57 -0400 |
commit | b99b87f70c7785ab1e253c6220f4b0b57ce3a7f7 (patch) | |
tree | ec5688052334448ec8edd3a1a9cb95cd68501ac7 /kernel | |
parent | e24aca672ff06aff0e6a1045efab86043ea5f735 (diff) |
kernel: constructor support
Call constructors (gcc-generated initcall-like functions) during kernel
start and module load. Constructors are e.g. used for gcov data
initialization.
Disable constructor support for usermode Linux to prevent conflicts with
host glibc.
Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Li Wei <W.Li@Sun.COM>
Cc: Michael Ellerman <michaele@au1.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Heiko Carstens <heicars2@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <mschwid2@linux.vnet.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/module.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c index 215aaab09e91..38928fcaff2b 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -2216,6 +2216,10 @@ static noinline struct module *load_module(void __user *umod, | |||
2216 | mod->unused_gpl_crcs = section_addr(hdr, sechdrs, secstrings, | 2216 | mod->unused_gpl_crcs = section_addr(hdr, sechdrs, secstrings, |
2217 | "__kcrctab_unused_gpl"); | 2217 | "__kcrctab_unused_gpl"); |
2218 | #endif | 2218 | #endif |
2219 | #ifdef CONFIG_CONSTRUCTORS | ||
2220 | mod->ctors = section_objs(hdr, sechdrs, secstrings, ".ctors", | ||
2221 | sizeof(*mod->ctors), &mod->num_ctors); | ||
2222 | #endif | ||
2219 | 2223 | ||
2220 | #ifdef CONFIG_MARKERS | 2224 | #ifdef CONFIG_MARKERS |
2221 | mod->markers = section_objs(hdr, sechdrs, secstrings, "__markers", | 2225 | mod->markers = section_objs(hdr, sechdrs, secstrings, "__markers", |
@@ -2389,6 +2393,17 @@ static noinline struct module *load_module(void __user *umod, | |||
2389 | goto free_hdr; | 2393 | goto free_hdr; |
2390 | } | 2394 | } |
2391 | 2395 | ||
2396 | /* Call module constructors. */ | ||
2397 | static void do_mod_ctors(struct module *mod) | ||
2398 | { | ||
2399 | #ifdef CONFIG_CONSTRUCTORS | ||
2400 | unsigned long i; | ||
2401 | |||
2402 | for (i = 0; i < mod->num_ctors; i++) | ||
2403 | mod->ctors[i](); | ||
2404 | #endif | ||
2405 | } | ||
2406 | |||
2392 | /* This is where the real work happens */ | 2407 | /* This is where the real work happens */ |
2393 | SYSCALL_DEFINE3(init_module, void __user *, umod, | 2408 | SYSCALL_DEFINE3(init_module, void __user *, umod, |
2394 | unsigned long, len, const char __user *, uargs) | 2409 | unsigned long, len, const char __user *, uargs) |
@@ -2417,6 +2432,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, | |||
2417 | blocking_notifier_call_chain(&module_notify_list, | 2432 | blocking_notifier_call_chain(&module_notify_list, |
2418 | MODULE_STATE_COMING, mod); | 2433 | MODULE_STATE_COMING, mod); |
2419 | 2434 | ||
2435 | do_mod_ctors(mod); | ||
2420 | /* Start the module */ | 2436 | /* Start the module */ |
2421 | if (mod->init != NULL) | 2437 | if (mod->init != NULL) |
2422 | ret = do_one_initcall(mod->init); | 2438 | ret = do_one_initcall(mod->init); |