From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 27 Jun 2013 14:19:33 +0000 (+0200)
Subject: manual merge of timers/core
X-Git-Tag: next-20130628~36^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ec563effc6be1d345ec89418f28fcd7863481fe;p=karo-tx-linux.git

manual merge of timers/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

5ec563effc6be1d345ec89418f28fcd7863481fe
diff --cc init/main.c
index ec549581d732,bef4a6ac7c76..c4f3f6d862cd
--- a/init/main.c
+++ b/init/main.c
@@@ -554,7 -556,7 +555,8 @@@ asmlinkage void __init start_kernel(voi
  	softirq_init();
  	timekeeping_init();
  	time_init();
+ 	sched_clock_postinit();
 +	perf_event_init();
  	profile_init();
  	call_function_init();
  	WARN(!irqs_disabled(), "Interrupts were enabled early\n");