init/do_mounts_rd.c: fix NULL pointer dereference while loading initramfs

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 63d3e8f2970c1377ec822bcb9db8ee306faecee6..aa061ef176266f21e7b697bb0423a60f7e22788e 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -124,7 +124,6 @@ EXPORT_SYMBOL(system_state);
 extern void time_init(void);
 /* Default late time init is NULL. archs can override this later. */
 void (*__initdata late_time_init)(void);
-extern void softirq_init(void);
 
 /* Untouched command line saved by arch-specific code. */
 char __initdata boot_command_line[COMMAND_LINE_SIZE];
@@ -693,7 +692,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
 
        if (preempt_count() != count) {
                sprintf(msgbuf, "preemption imbalance ");
-               preempt_count() = count;
+               preempt_count_set(count);
        }
        if (irqs_disabled()) {
                strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));