]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - init/main.c
Merge tag 'acpi-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
[linux.git] / init / main.c
index 96f8d5af52d61a877d661bfd15ca8fc42e7296ae..653693da8da61529678ffdb6376dc2b5cc3df2ca 100644 (file)
@@ -433,7 +433,7 @@ noinline void __ref rest_init(void)
 
        /*
         * Enable might_sleep() and smp_processor_id() checks.
-        * They cannot be enabled earlier because with CONFIG_PREEMPT=y
+        * They cannot be enabled earlier because with CONFIG_PREEMPTION=y
         * kernel_thread() would trigger might_sleep() splats. With
         * CONFIG_PREEMPT_VOLUNTARY=y the init task might have scheduled
         * already, but it's stuck on the kthreadd_done completion.