Commit c75d5c5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32: forced setting of mode of sun4m per-cpu timers
parents 2d3c7efa e51e07e0

arch/sparc/kernel/sun4m_irq.c

+3 −0
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) 
	timers_global = (void __iomem *)

		(unsigned long) addr[num_cpu_timers];



	/* Every per-cpu timer works in timer mode */

	sbus_writel(0x00000000, &timers_global->timer_config);



	sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit);



	master_l10_counter = &timers_global->l10_count;