Merge remote-tracking branch 'wireless/master'

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 586cd3359c02c8c2afebf66dea9a3a6de0249b03..63d3e8f2970c1377ec822bcb9db8ee306faecee6 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -75,6 +75,7 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/sched_clock.h>
+#include <linux/context_tracking.h>
 #include <linux/random.h>
 
 #include <asm/io.h>
@@ -546,6 +547,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();