]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
manual merge of timers/core
authorIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:19:33 +0000 (16:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:19:33 +0000 (16:19 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/arm/Kconfig
arch/x86/kernel/kvmclock.c
arch/x86/platform/efi/efi.c
init/Kconfig
init/main.c
kernel/time/tick-broadcast.c
kernel/time/timekeeping.c

Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc init/main.c
index ec549581d732f633ca002c823a38ed15a6d31a60,bef4a6ac7c76dd62ad6339fd5a11b81b87c79009..c4f3f6d862cd03246aa8b62252aa983375f50b1c
@@@ -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");
Simple merge
Simple merge