diff options
| author |   Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
| commit | f445d05328a2d627c2fb70c79d8b01455c254609 (patch) | |
| tree | e46c5f112ba429f836c0c63719b928a8e14fb131 /kernel/timer.c | |
| parent | ARM: OMAP2+: control: add OMAP5 support for dsp boot programming (diff) | |
| parent | ARM: OMAP: add vdds_sdi supply for omapdss_sdi.0 (diff) | |
Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index a860bba34412..15ffdb3f1948 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1539,12 +1539,12 @@ static int __cpuinit init_timers_cpu(int cpu) boot_done = 1; base = &boot_tvec_bases; } + spin_lock_init(&base->lock); tvec_base_done[cpu] = 1; } else { base = per_cpu(tvec_bases, cpu); } - spin_lock_init(&base->lock); for (j = 0; j < TVN_SIZE; j++) { INIT_LIST_HEAD(base->tv5.vec + j); |