Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / drivers / clocksource / mips-gic-timer.c

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 7a960cd0110494a0c5b885fd6e89b81f3fec9c9c..d9ef7a61e093964485e2f078c733a299b33cc409 100644 (file)
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -120,12 +120,12 @@ static int gic_clockevent_init(void)
        }
 
        cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING,
-                         "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu,
-                         gic_dying_cpu);
+                         "clockevents/mips/gic/timer:starting",
+                         gic_starting_cpu, gic_dying_cpu);
        return 0;
 }
 
-static cycle_t gic_hpt_read(struct clocksource *cs)
+static u64 gic_hpt_read(struct clocksource *cs)
 {
        return gic_read_count();
 }