2 files changed, 21 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
        default "$ARCH_DEFCONFIG"
        default "arch/$ARCH/defconfig"
+config CONSTRUCTORS
+        bool
+        depends on !UML
+        default y
 menu "General setup"
 config EXPERIMENTAL
diff --git a/init/main.c b/init/main.c
index 0e7aedeaa05f..09131ec090c1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -642,6 +642,10 @@ asmlinkage void __init start_kernel(void)
                                 "enabled early\n");
        early_boot_irqs_on();
        local_irq_enable();
+        /* Interrupts are enabled now so all GFP allocations are safe. */
+        set_gfp_allowed_mask(__GFP_BITS_MASK);
        kmem_cache_init_late();
        /*
@@ -720,6 +724,17 @@ asmlinkage void __init start_kernel(void)
        rest_init();
 }
+/* Call all constructor functions linked into the kernel. */
+static void __init do_ctors(void)
+{
+#ifdef CONFIG_CONSTRUCTORS
+        ctor_fn_t *call = (ctor_fn_t *) __ctors_start;
+        for (; call < (ctor_fn_t *) __ctors_end; call++)
+                (*call)();
+#endif
+}
 int initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
@@ -800,6 +815,7 @@ static void __init do_basic_setup(void)
        usermodehelper_init();
        driver_init();
        init_irq_proc();
+        do_ctors();
        do_initcalls();
 }