git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
time.c
diff --git
a/arch/arm/mach-pxa/time.c
b/arch/arm/mach-pxa/time.c
index
de68470
..
b503049
100644
(file)
--- a/
arch/arm/mach-pxa/time.c
+++ b/
arch/arm/mach-pxa/time.c
@@
-16,7
+16,6
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/clockchips.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/clockchips.h>
-#include <linux/sched.h>
#include <asm/div64.h>
#include <asm/mach/irq.h>
#include <asm/div64.h>
#include <asm/mach/irq.h>
@@
-32,18
+31,10
@@
* long as there is always less than 582 seconds between successive
* calls to sched_clock() which should always be the case in practice.
*/
* long as there is always less than 582 seconds between successive
* calls to sched_clock() which should always be the case in practice.
*/
-static DEFINE_CLOCK_DATA(cd);
-
unsigned long long notrace
sched_clock(void)
+
static u32 notrace pxa_read_
sched_clock(void)
{
{
- u32 cyc = OSCR;
- return cyc_to_sched_clock(&cd, cyc, (u32)~0);
-}
-
-static void notrace pxa_update_sched_clock(void)
-{
- u32 cyc = OSCR;
- update_sched_clock(&cd, cyc, (u32)~0);
+ return OSCR;
}
}
@@
-119,7
+110,7
@@
static void __init pxa_timer_init(void)
OIER = 0;
OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
OIER = 0;
OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
-
init_sched_clock(&cd, pxa_update
_sched_clock, 32, clock_tick_rate);
+
setup_sched_clock(pxa_read
_sched_clock, 32, clock_tick_rate);
clockevents_calc_mult_shift(&ckevt_pxa_osmr0, clock_tick_rate, 4);
ckevt_pxa_osmr0.max_delta_ns =
clockevents_calc_mult_shift(&ckevt_pxa_osmr0, clock_tick_rate, 4);
ckevt_pxa_osmr0.max_delta_ns =