aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-06-01 23:39:40 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-06-12 14:02:13 -0700
commit38ff87f77af0b5a93fc8581cff1d6e5692ab8970 (patch)
tree7a157528657400d0486cd4e74da98bad40992c3c /init
parentffbfb5e316f0db486798ccf1db36a577ffe79637 (diff)
downloadlinux-38ff87f77af0b5a93fc8581cff1d6e5692ab8970.tar.gz
sched_clock: Make ARM's sched_clock generic for all architectures
Nothing about the sched_clock implementation in the ARM port is specific to the architecture. Generalize the code so that other architectures can use it by selecting GENERIC_SCHED_CLOCK. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> [jstultz: Merge minor collisions with other patches in my tree] Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
-rw-r--r--init/main.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 9d3a7887a6d..1a3f93329a6 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -757,6 +757,9 @@ config LOG_BUF_SHIFT
config HAVE_UNSTABLE_SCHED_CLOCK
bool
+config GENERIC_SCHED_CLOCK
+ bool
+
#
# For architectures that want to enable the support for NUMA-affine scheduler
# balancing logic:
diff --git a/init/main.c b/init/main.c
index 9484f4ba88d..bef4a6ac7c7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -74,6 +74,7 @@
#include <linux/ptrace.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
+#include <linux/sched_clock.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -555,6 +556,7 @@ asmlinkage void __init start_kernel(void)
softirq_init();
timekeeping_init();
time_init();
+ sched_clock_postinit();
profile_init();
call_function_init();
WARN(!irqs_disabled(), "Interrupts were enabled early\n");