Merge tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze

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

diff --git a/init/main.c b/init/main.c
index f2366533c922de7a49f1f9beee6b977603bdaaf2..af310afbef2867e987973cc341a7b418f7413068 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -74,6 +74,8 @@
 #include <linux/ptrace.h>
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
+#include <linux/sched_clock.h>
+#include <linux/context_tracking.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -544,6 +546,7 @@ asmlinkage void __init start_kernel(void)
        idr_init_cache();
        rcu_init();
        tick_nohz_init();
+       context_tracking_init();
        radix_tree_init();
        /* init some links before init_ISA_irqs() */
        early_irq_init();
@@ -554,6 +557,7 @@ asmlinkage void __init start_kernel(void)
        softirq_init();
        timekeeping_init();
        time_init();
+       sched_clock_postinit();
        perf_event_init();
        profile_init();
        call_function_init();