ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match

[firefly-linux-kernel-4.4.55.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index ff49a6dacfbbdf673e38f4797127c5e4b8de8c73..c24805c824b981d92b134e84792b66b515b0ef46 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -374,11 +374,8 @@ static noinline void __init_refok rest_init(void)
         * at least once to get things moving:
         */
        init_idle_bootup_task(current);
-       preempt_enable_no_resched();
-       schedule();
-
+       schedule_preempt_disabled();
        /* Call into cpu_idle with preempt disabled */
-       preempt_disable();
        cpu_idle();
 }
 
@@ -449,8 +446,8 @@ void __init __weak thread_info_cache_init(void)
 static void __init mm_init(void)
 {
        /*
-        * page_cgroup requires countinous pages as memmap
-        * and it's bigger than MAX_ORDER unless SPARSEMEM.
+        * page_cgroup requires contiguous pages,
+        * bigger than MAX_ORDER unless SPARSEMEM.
         */
        page_cgroup_init_flatmem();
        mem_init();