diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 5 | ||||
-rw-r--r-- | init/main.c | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index c4b3c6d51a72..1ce05a4cb5f6 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -16,6 +16,11 @@ config DEFCONFIG_LIST | |||
16 | default "$ARCH_DEFCONFIG" | 16 | default "$ARCH_DEFCONFIG" |
17 | default "arch/$ARCH/defconfig" | 17 | default "arch/$ARCH/defconfig" |
18 | 18 | ||
19 | config CONSTRUCTORS | ||
20 | bool | ||
21 | depends on !UML | ||
22 | default y | ||
23 | |||
19 | menu "General setup" | 24 | menu "General setup" |
20 | 25 | ||
21 | config EXPERIMENTAL | 26 | config EXPERIMENTAL |
diff --git a/init/main.c b/init/main.c index 0e7aedeaa05f..1a65fdd06318 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -720,6 +720,17 @@ asmlinkage void __init start_kernel(void) | |||
720 | rest_init(); | 720 | rest_init(); |
721 | } | 721 | } |
722 | 722 | ||
723 | /* Call all constructor functions linked into the kernel. */ | ||
724 | static void __init do_ctors(void) | ||
725 | { | ||
726 | #ifdef CONFIG_CONSTRUCTORS | ||
727 | ctor_fn_t *call = (ctor_fn_t *) __ctors_start; | ||
728 | |||
729 | for (; call < (ctor_fn_t *) __ctors_end; call++) | ||
730 | (*call)(); | ||
731 | #endif | ||
732 | } | ||
733 | |||
723 | int initcall_debug; | 734 | int initcall_debug; |
724 | core_param(initcall_debug, initcall_debug, bool, 0644); | 735 | core_param(initcall_debug, initcall_debug, bool, 0644); |
725 | 736 | ||
@@ -800,6 +811,7 @@ static void __init do_basic_setup(void) | |||
800 | usermodehelper_init(); | 811 | usermodehelper_init(); |
801 | driver_init(); | 812 | driver_init(); |
802 | init_irq_proc(); | 813 | init_irq_proc(); |
814 | do_ctors(); | ||
803 | do_initcalls(); | 815 | do_initcalls(); |
804 | } | 816 | } |
805 | 817 | ||