Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60d687e7 authored by John Stultz's avatar John Stultz Committed by John Stultz
Browse files

clocksource: um: Convert to clocksource_register_hz/khz 



This converts the um clocksource to use clocksource_register_hz/khz

This is untested, so any assistance in testing would be appreciated!

CC: Jeff Dike <jdike@addtoit.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
parent 63e49634

arch/um/kernel/time.c

+2 −4
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ static struct clocksource itimer_clocksource = { 
	.rating		= 300,

	.read		= itimer_read,

	.mask		= CLOCKSOURCE_MASK(64),

	.mult		= 1000,

	.shift		= 0,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};
@@ -94,9 +92,9 @@ static void __init setup_itimer(void) 
		clockevent_delta2ns(60 * HZ, &itimer_clockevent);

	itimer_clockevent.min_delta_ns =

		clockevent_delta2ns(1, &itimer_clockevent);

	err = clocksource_register(&itimer_clocksource);

	err = clocksource_register_hz(&itimer_clocksource, USEC_PER_SEC);

	if (err) {

		printk(KERN_ERR "clocksource_register returned %d\n", err);

		printk(KERN_ERR "clocksource_register_hz returned %d\n", err);

		return;

	}

	clockevents_register_device(&itimer_clockevent);