Commit 273d16ad authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: architected timers: add support for UP timer 



If CONFIG_LOCAL_TIMERS is not defined, let the architected timer
driver register a single clock_event_device that is used as a
global timer.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 0075242b

arch/arm/kernel/arch_timer.c

+13 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ static struct local_timer_ops arch_timer_ops __cpuinitdata = { 
	.stop	= arch_timer_stop,

};



static struct clock_event_device arch_timer_global_evt;



static int __init arch_timer_common_register(void)

{

	int err;
@@ -280,6 +282,17 @@ static int __init arch_timer_common_register(void) 
	}



	err = local_timer_register(&arch_timer_ops);

	if (err) {

		/*

		 * We couldn't register as a local timer (could be

		 * because we're on a UP platform, or because some

		 * other local timer is already present...). Try as a

		 * global timer instead.

		 */

		arch_timer_global_evt.cpumask = cpumask_of(0);

		err = arch_timer_setup(&arch_timer_global_evt);

	}



	if (err)

		goto out_free_irq;