diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-04-01 13:53:38 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-10 18:27:12 -0500 |
| commit | 7e48c0b9d9ab07c92cd26f167010cd5a50eb0cec (patch) | |
| tree | 05e8d8f956f1b035105fc947cb5ec676a0ddece8 | |
| parent | c115739da801ea1ea20c48e2991ce6761496bef1 (diff) | |
| download | op-kernel-dev-7e48c0b9d9ab07c92cd26f167010cd5a50eb0cec.zip op-kernel-dev-7e48c0b9d9ab07c92cd26f167010cd5a50eb0cec.tar.gz | |
ARM: make sched_clock just call a function pointer
This converts sched_clock to simply a call to a function pointer in order
to allow overriding it. This will allow for use with 64-bit counters where
overflow handling is not needed.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| -rw-r--r-- | arch/arm/include/asm/sched_clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/sched_clock.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h index e3f7572..3d520dd 100644 --- a/arch/arm/include/asm/sched_clock.h +++ b/arch/arm/include/asm/sched_clock.h @@ -11,4 +11,6 @@ extern void sched_clock_postinit(void); extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); +extern unsigned long long (*sched_clock_func)(void); + #endif diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c index 040168e..8805848 100644 --- a/arch/arm/kernel/sched_clock.c +++ b/arch/arm/kernel/sched_clock.c @@ -165,12 +165,19 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) pr_debug("Registered %pF as sched_clock source\n", read); } -unsigned long long notrace sched_clock(void) +static unsigned long long notrace sched_clock_32(void) { u32 cyc = read_sched_clock(); return cyc_to_sched_clock(cyc, sched_clock_mask); } +unsigned long long __read_mostly (*sched_clock_func)(void) = sched_clock_32; + +unsigned long long notrace sched_clock(void) +{ + return sched_clock_func(); +} + void __init sched_clock_postinit(void) { /* |
