diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
tree | 6a62ccb019668215f70bcc9876a795548f57262a /drivers/clocksource/sh_tmu.c | |
parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
parent | 0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff) | |
download | linux-7533185eeefd087d5472422181ae8edf75118213.tar.xz |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
Diffstat (limited to 'drivers/clocksource/sh_tmu.c')
-rw-r--r-- | drivers/clocksource/sh_tmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 0f665b8f2461..f150ca82bfaf 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -428,7 +428,7 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, ced->features = CLOCK_EVT_FEAT_PERIODIC; ced->features |= CLOCK_EVT_FEAT_ONESHOT; ced->rating = 200; - ced->cpumask = cpumask_of(0); + ced->cpumask = cpu_possible_mask; ced->set_next_event = sh_tmu_clock_event_next; ced->set_mode = sh_tmu_clock_event_mode; ced->suspend = sh_tmu_clock_event_suspend; |