aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/generic.c4
-rw-r--r--arch/arm/mach-pxa/time.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 6ae605857ca9..9de1278d234f 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -76,7 +76,9 @@ unsigned long long sched_clock(void)
76 /* 76 /*
77 * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for 77 * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for
78 * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand 78 * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand
79 * years range which is nice, but with higher computation cost. 79 * years range and truncation to unsigned long long limits it to
80 * sched_clock's max range of ~584 years. This is nice but with
81 * higher computation cost.
80 */ 82 */
81 { 83 {
82 union { 84 union {
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 3775b8f38429..ee2beb400414 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -101,7 +101,7 @@ static struct irqaction pxa_timer_irq = {
101 .handler = pxa_timer_interrupt, 101 .handler = pxa_timer_interrupt,
102}; 102};
103 103
104cycle_t pxa_get_cycles(void) 104static cycle_t pxa_get_cycles(void)
105{ 105{
106 return OSCR; 106 return OSCR;
107} 107}
@@ -134,13 +134,13 @@ static void __init pxa_timer_init(void)
134 OSMR0 = OSCR + LATCH; /* set initial match */ 134 OSMR0 = OSCR + LATCH; /* set initial match */
135 local_irq_restore(flags); 135 local_irq_restore(flags);
136 136
137 /* on PXA OSCR runs continiously and is not written to, so we can use it 137 /*
138 * as clock source directly. 138 * OSCR runs continuously on PXA and is not written to,
139 * so we can use it as clock source directly.
139 */ 140 */
140 clocksource_pxa.mult = 141 clocksource_pxa.mult =
141 clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift); 142 clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift);
142 clocksource_register(&clocksource_pxa); 143 clocksource_register(&clocksource_pxa);
143
144} 144}
145 145
146#ifdef CONFIG_NO_IDLE_HZ 146#ifdef CONFIG_NO_IDLE_HZ