diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 08:53:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 08:53:53 -0800 |
| commit | 50a561ca1bd1151c78a2412e6a990fda15eb434d (patch) | |
| tree | 27076ba4e06b6e671b1522db735900f3199cee23 /arch | |
| parent | e9296e89b85604862bd9ec2d54dc43edad775c0d (diff) | |
| parent | ea3aacf5f22c1002cac97985354658072232e280 (diff) | |
| download | linux-50a561ca1bd1151c78a2412e6a990fda15eb434d.tar.gz linux-50a561ca1bd1151c78a2412e6a990fda15eb434d.tar.bz2 linux-50a561ca1bd1151c78a2412e6a990fda15eb434d.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/common/timer-sp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index df13a3ffff35..9d2d3ba339ff 100644 --- a/arch/arm/common/timer-sp.c +++ b/arch/arm/common/timer-sp.c @@ -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); |