diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-01 23:39:40 -0700 |
|---|---|---|
| committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2014-01-13 12:03:37 +0530 |
| commit | 9677b59f55e348c330eeb8cd9a6f7b2f613839a5 (patch) | |
| tree | 51c4e85fb28b3915e3446b142881ce0bcb908e1b /init | |
| parent | 8ec79f015299aafb8e44095545a4e2656e6992c9 (diff) | |
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.
Bug 1399318
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>
(cherry picked from commit 38ff87f77af0b5a93fc8581cff1d6e5692ab8970)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Change-Id: Iaac325635344ef4adee8fa0f9ca11aee089bce0f
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 | ||||
| -rw-r--r-- | init/main.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 0486e886586a..20cd427eee1c 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -758,6 +758,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 81e989809ae3..c22e93f8cffa 100644 --- a/init/main.c +++ b/init/main.c @@ -75,6 +75,7 @@ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/random.h> +#include <linux/sched_clock.h> #include <linux/pasr.h> #include <asm/io.h> @@ -560,6 +561,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"); |