Skip to content

Commit

Permalink
ARM: make sched_clock just call a function pointer
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Rob Herring committed Apr 10, 2013
1 parent c115739 commit 7e48c0b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/arm/include/asm/sched_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 8 additions & 1 deletion arch/arm/kernel/sched_clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
/*
Expand Down

0 comments on commit 7e48c0b

Please sign in to comment.