diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-03-05 09:14:05 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-03-07 10:13:25 -0500 |
commit | ad2b13536ace08dfcca4cf86b75a5d06efe06373 (patch) | |
tree | b518daf029f3337ed438d620538129e95ded31ab /init | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
tick: Call tick_init late
To convert the clockevents code to cpumask_var_t we need to move the
init call after the allocator setup.
Clockevents are earliest registered from time_init() as they need
interrupts being set up, so this is safe.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20130306111537.304379448@linutronix.de
Cc: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 63534a141b4e..b3e061428545 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -494,7 +494,6 @@ asmlinkage void __init start_kernel(void) | |||
494 | * Interrupts are still disabled. Do necessary setups, then | 494 | * Interrupts are still disabled. Do necessary setups, then |
495 | * enable them | 495 | * enable them |
496 | */ | 496 | */ |
497 | tick_init(); | ||
498 | boot_cpu_init(); | 497 | boot_cpu_init(); |
499 | page_address_init(); | 498 | page_address_init(); |
500 | printk(KERN_NOTICE "%s", linux_banner); | 499 | printk(KERN_NOTICE "%s", linux_banner); |
@@ -551,6 +550,7 @@ asmlinkage void __init start_kernel(void) | |||
551 | /* init some links before init_ISA_irqs() */ | 550 | /* init some links before init_ISA_irqs() */ |
552 | early_irq_init(); | 551 | early_irq_init(); |
553 | init_IRQ(); | 552 | init_IRQ(); |
553 | tick_init(); | ||
554 | init_timers(); | 554 | init_timers(); |
555 | hrtimers_init(); | 555 | hrtimers_init(); |
556 | softirq_init(); | 556 | softirq_init(); |