These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / kernel / cevt-r4k.c

diff --git a/kernel/arch/mips/kernel/cevt-r4k.c b/kernel/arch/mips/kernel/cevt-r4k.c
index d70c4d8..8dfe6a6 100644 (file)
--- a/kernel/arch/mips/kernel/cevt-r4k.c
+++ b/kernel/arch/mips/kernel/cevt-r4k.c
@@ -28,12 +28,6 @@ static int mips_next_event(unsigned long delta,
        return res;
 }
 
-void mips_set_clock_mode(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
-{
-       /* Nothing to do ...  */
-}
-
 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
 int cp0_timer_irq_installed;
 
@@ -174,6 +168,11 @@ int c0_compare_int_usable(void)
        return 1;
 }
 
+unsigned int __weak get_c0_compare_int(void)
+{
+       return MIPS_CPU_IRQ_BASE + cp0_compare_irq;
+}
+
 int r4k_clockevent_init(void)
 {
        unsigned int cpu = smp_processor_id();
@@ -189,11 +188,9 @@ int r4k_clockevent_init(void)
        /*
         * With vectored interrupts things are getting platform specific.
         * get_c0_compare_int is a hook to allow a platform to return the
-        * interrupt number of it's liking.
+        * interrupt number of its liking.
         */
-       irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
-       if (get_c0_compare_int)
-               irq = get_c0_compare_int();
+       irq = get_c0_compare_int();
 
        cd = &per_cpu(mips_clockevent_device, cpu);
 
@@ -212,7 +209,6 @@ int r4k_clockevent_init(void)
        cd->irq                 = irq;
        cd->cpumask             = cpumask_of(cpu);
        cd->set_next_event      = mips_next_event;
-       cd->set_mode            = mips_set_clock_mode;
        cd->event_handler       = mips_event_handler;
 
        clockevents_register_device(cd);