* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: Remove duplicate setting of new_base in __mod_timer() clockevents: Prevent clockevent_devices list corruption on cpu hotplug
Unified · Split
| @@ -238,8 +238,9 @@ void clockevents_exchange_device(struct clock_event_device *old, · 237 unmodified lines | ||
| 238 | 238 | */ |
| 239 | 239 | void clockevents_notify(unsigned long reason, void *arg) |
| 240 | 240 | { |
| 241 | − struct list_head *node, *tmp; | |
| 241 | + struct clock_event_device *dev, *tmp; | |
| 242 | 242 | unsigned long flags; |
| 243 | + int cpu; | |
| 243 | 244 | |
| 244 | 245 | raw_spin_lock_irqsave(&clockevents_lock, flags); |
| 245 | 246 | clockevents_do_notify(reason, arg); |
| @@ -250,8 +251,19 @@ void clockevents_notify(unsigned long reason, void *arg) · 4 unmodified lines | ||
| 250 | 251 | * Unregister the clock event devices which were |
| 251 | 252 | * released from the users in the notify chain. |
| 252 | 253 | */ |
| 253 | − list_for_each_safe(node, tmp, &clockevents_released) | |
| 254 | − list_del(node); | |
| 254 | + list_for_each_entry_safe(dev, tmp, &clockevents_released, list) | |
| 255 | + list_del(&dev->list); | |
| 256 | + /* | |
| 257 | + * Now check whether the CPU has left unused per cpu devices | |
| 258 | + */ | |
| 259 | + cpu = *((int *)arg); | |
| 260 | + list_for_each_entry_safe(dev, tmp, &clockevent_devices, list) { | |
| 261 | + if (cpumask_test_cpu(cpu, dev->cpumask) && | |
| 262 | + cpumask_weight(dev->cpumask) == 1) { | |
| 263 | + BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED); | |
| 264 | + list_del(&dev->list); | |
| 265 | + } | |
| 266 | + } | |
| 255 | 267 | break; |
| 256 | 268 | default: |
| 257 | 269 | break; |
| @@ -656,8 +656,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, · 655 unmodified lines | ||
| 656 | 656 | |
| 657 | 657 | debug_activate(timer, expires); |
| 658 | 658 | |
| 659 | − new_base = __get_cpu_var(tvec_bases); | |
| 660 | − | |
| 661 | 659 | cpu = smp_processor_id(); |
| 662 | 660 | |
| 663 | 661 | #if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP) |