History

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clockevent: Don't remove broadcast device when cpu is dead

Linus Torvalds committed 16 years ago

Commit f6760aa2 parents 90ea301 ea9d8e31 file · +2 −1Browse files

Unified · Split

kernel/time/clockevents.c+2−1
@@ -259,7 +259,8 @@ void clockevents_notify(unsigned long reason, void *arg) · 258 unmodified lines
259259 cpu = *((int *)arg);
260260 list_for_each_entry_safe(dev, tmp, &clockevent_devices, list) {
261261 if (cpumask_test_cpu(cpu, dev->cpumask) &&
262− cpumask_weight(dev->cpumask) == 1) {
262+ cpumask_weight(dev->cpumask) == 1 &&
263+ !tick_is_broadcast_device(dev)) {
263264 BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);
264265 list_del(&dev->list);
265266 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t