diff options
| author | Paul Burton | 2014-03-05 12:41:47 +0100 |
|---|---|---|
| committer | Paul Burton | 2014-05-02 17:39:12 +0200 |
| commit | 60bdb9c7bd9ab5b63ad68e9391056f8757b810f1 (patch) | |
| tree | 952c0243845c2660d24ffc8a23ab0b88cbf65b4d /arch/mips/kernel | |
| parent | MIPS: mark R4K clockevent device with CLOCK_EVT_FEAT_PERCPU (diff) | |
| download | kernel-qcow2-linux-60bdb9c7bd9ab5b63ad68e9391056f8757b810f1.tar.gz kernel-qcow2-linux-60bdb9c7bd9ab5b63ad68e9391056f8757b810f1.tar.xz kernel-qcow2-linux-60bdb9c7bd9ab5b63ad68e9391056f8757b810f1.zip | |
MIPS: allow R4K clockevent device to function regardless of GIC
Having the GIC clockevent driver compiled should not prevent the R4K
timer clockevent driver from functioning. One will be selected as the
CPU local timer based upon their priorities and the other may simply be
unused or in the case of the GIC timer may be used as the tick broadcast
device.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index f3c549c4b75e..4dcd1fb5c41d 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -72,9 +72,6 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id) /* Clear Count/Compare Interrupt */ write_c0_compare(read_c0_compare()); cd = &per_cpu(mips_clockevent_device, cpu); -#ifdef CONFIG_CEVT_GIC - if (!gic_present) -#endif cd->event_handler(cd); } @@ -212,9 +209,6 @@ int r4k_clockevent_init(void) cd->set_mode = mips_set_clock_mode; cd->event_handler = mips_event_handler; -#ifdef CONFIG_CEVT_GIC - if (!gic_present) -#endif clockevents_register_device(cd); if (cp0_timer_irq_installed) |