Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs

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

diff --git a/init/main.c b/init/main.c
index 63d3e8f..379090f 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -693,7 +693,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));