diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-12-03 23:35:27 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-12-03 23:35:27 -0500 |
| commit | b48a486109bc83601278b73f46f4386943bbb9fb (patch) | |
| tree | bf04e752c843d45a2ebf015bbe4fede3aa0234af /arch/arm | |
| parent | f547c9596af656dff474b0fa2f5c0c1a4e6876fa (diff) | |
| parent | 3d514b82fc30a1425eba9e7b8f24620a4ec8a633 (diff) | |
Merge tag 'v3.4.21' into v3.4-rt
This is the 3.4.21 stable release
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 5068fe5a6910..fd433e7a25fd 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -50,22 +50,29 @@ static u32 notrace omap_32k_read_sched_clock(void) * nsecs and adds to a monotonically increasing timespec. */ static struct timespec persistent_ts; -static cycles_t cycles, last_cycles; +static cycles_t cycles; static unsigned int persistent_mult, persistent_shift; +static DEFINE_SPINLOCK(read_persistent_clock_lock); + void read_persistent_clock(struct timespec *ts) { unsigned long long nsecs; - cycles_t delta; - struct timespec *tsp = &persistent_ts; + cycles_t last_cycles; + unsigned long flags; + + spin_lock_irqsave(&read_persistent_clock_lock, flags); last_cycles = cycles; cycles = timer_32k_base ? __raw_readl(timer_32k_base) : 0; - delta = cycles - last_cycles; - nsecs = clocksource_cyc2ns(delta, persistent_mult, persistent_shift); + nsecs = clocksource_cyc2ns(cycles - last_cycles, + persistent_mult, persistent_shift); + + timespec_add_ns(&persistent_ts, nsecs); + + *ts = persistent_ts; - timespec_add_ns(tsp, nsecs); - *ts = *tsp; + spin_unlock_irqrestore(&read_persistent_clock_lock, flags); } int __init omap_init_clocksource_32k(void) |