diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-05-28 21:00:14 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-29 17:08:23 +0400 |
| commit | 2e2d663d2dd64ffe9855be0b35aa221c9b8139f2 (patch) | |
| tree | 508667aa6fbab564e7875d3953671265d0176e69 /arch/mips/kernel/cevt-gic.c | |
| parent | 5ec79bf919ddb53fd98893b7217897c839aa19cc (diff) | |
| parent | 322014531e1fac4674b8eef67e4f80aca1e9f003 (diff) | |
| download | linux-2e2d663d2dd64ffe9855be0b35aa221c9b8139f2.tar.xz | |
Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/cevt-gic.c')
| -rw-r--r-- | arch/mips/kernel/cevt-gic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/cevt-gic.c b/arch/mips/kernel/cevt-gic.c index 594cbbf16d62..6093716980b9 100644 --- a/arch/mips/kernel/cevt-gic.c +++ b/arch/mips/kernel/cevt-gic.c @@ -26,7 +26,7 @@ static int gic_next_event(unsigned long delta, struct clock_event_device *evt) cnt = gic_read_count(); cnt += (u64)delta; - gic_write_compare(cnt); + gic_write_cpu_compare(cnt, cpumask_first(evt->cpumask)); res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0; return res; } @@ -73,7 +73,8 @@ int gic_clockevent_init(void) cd = &per_cpu(gic_clockevent_device, cpu); cd->name = "MIPS GIC"; - cd->features = CLOCK_EVT_FEAT_ONESHOT; + cd->features = CLOCK_EVT_FEAT_ONESHOT | + CLOCK_EVT_FEAT_C3STOP; clockevent_set_clock(cd, gic_frequency); |