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

Commit 3ade4f81 authored by Stephen Boyd's avatar Stephen Boyd Committed by Chris Zankel
Browse files

xtensa: Switch to sched_clock_register() 



The 32 bit sched_clock interface now supports 64 bits. Upgrade
to the 64 bit function to allow us to remove the 32 bit
registration interface.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 49b424fe

arch/xtensa/kernel/time.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ static cycle_t ccount_read(struct clocksource *cs) 
	return (cycle_t)get_ccount();

	return (cycle_t)get_ccount();

}

}





static u32 notrace ccount_sched_clock_read(void)

static u64 notrace ccount_sched_clock_read(void)

{

{

	return get_ccount();

	return get_ccount();

}

}
@@ -147,7 +147,7 @@ void __init time_init(void) 
	clocksource_register_hz(&ccount_clocksource, ccount_freq);

	clocksource_register_hz(&ccount_clocksource, ccount_freq);

	local_timer_setup(0);

	local_timer_setup(0);

	setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);

	setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);

	setup_sched_clock(ccount_sched_clock_read, 32, ccount_freq);

	sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);

}

}





/*

/*