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

Commit 50a561ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull final ARM fix from Russell King:
 "One final fix, spotted by Will, to do with what happens when we boot a
  SMP kernel on UP."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7586/1: sp804: set cpumask to cpu_possible_mask for clock event device
parents e9296e89 ea3aacf5

arch/arm/common/timer-sp.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static struct clock_event_device sp804_clockevent = { 
	.set_mode	= sp804_set_mode,

	.set_next_event	= sp804_set_next_event,

	.rating		= 300,

	.cpumask	= cpu_all_mask,

};



static struct irqaction sp804_timer_irq = {
@@ -185,6 +184,7 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq, 
	clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);

	evt->name = name;

	evt->irq = irq;

	evt->cpumask = cpu_possible_mask;



	setup_irq(irq, &sp804_timer_irq);

	clockevents_config_and_register(evt, rate, 0xf, 0xffffffff);