diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 11f4f145be3f..b34fd8e5edef 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -451,6 +451,7 @@ static noinline void __init_refok rest_init(void) | |||
451 | { | 451 | { |
452 | int pid; | 452 | int pid; |
453 | 453 | ||
454 | rcu_scheduler_starting(); | ||
454 | kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND); | 455 | kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND); |
455 | numa_default_policy(); | 456 | numa_default_policy(); |
456 | pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES); | 457 | pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES); |
@@ -462,7 +463,6 @@ static noinline void __init_refok rest_init(void) | |||
462 | * at least once to get things moving: | 463 | * at least once to get things moving: |
463 | */ | 464 | */ |
464 | init_idle_bootup_task(current); | 465 | init_idle_bootup_task(current); |
465 | rcu_scheduler_starting(); | ||
466 | preempt_enable_no_resched(); | 466 | preempt_enable_no_resched(); |
467 | schedule(); | 467 | schedule(); |
468 | preempt_disable(); | 468 | preempt_disable(); |
@@ -631,7 +631,6 @@ asmlinkage void __init start_kernel(void) | |||
631 | softirq_init(); | 631 | softirq_init(); |
632 | timekeeping_init(); | 632 | timekeeping_init(); |
633 | time_init(); | 633 | time_init(); |
634 | sched_clock_init(); | ||
635 | profile_init(); | 634 | profile_init(); |
636 | if (!irqs_disabled()) | 635 | if (!irqs_disabled()) |
637 | printk(KERN_CRIT "start_kernel(): bug: interrupts were " | 636 | printk(KERN_CRIT "start_kernel(): bug: interrupts were " |
@@ -682,6 +681,7 @@ asmlinkage void __init start_kernel(void) | |||
682 | numa_policy_init(); | 681 | numa_policy_init(); |
683 | if (late_time_init) | 682 | if (late_time_init) |
684 | late_time_init(); | 683 | late_time_init(); |
684 | sched_clock_init(); | ||
685 | calibrate_delay(); | 685 | calibrate_delay(); |
686 | pidmap_init(); | 686 | pidmap_init(); |
687 | anon_vma_init(); | 687 | anon_vma_init(); |