History

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull smpboot bugfix from Thomas Gleixner: "A single bugfix for a regression introduced with the conversion of the stop machine threads to the generic smpboot thread management facility" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: stop_machine: Mark per cpu stopper enabled early

Linus Torvalds committed 13 years ago

Commit 6516ab62 parents 06e79d3 46c498c3 files · +7 −1Browse files

Showing the changes to kernel (2 of 3 files). Show all

Unified · Split

2 files
  1. kernel/smpboot.c +2 −0
  2. kernel/stop_machine.c +1 −1
kernel/smpboot.c+2−0
@@ -209,6 +209,8 @@ static void smpboot_unpark_thread(struct smp_hotplug_thread *ht, unsigned int cp · 208 unmodified lines
209{209{
210 struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);210 struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
211 211
212 if (ht->pre_unpark)
213 ht->pre_unpark(cpu);
212 kthread_unpark(tsk);214 kthread_unpark(tsk);
213}215}
214 216
kernel/stop_machine.c+1−1
@@ -336,7 +336,7 @@ static struct smp_hotplug_thread cpu_stop_threads = { · 335 unmodified lines
336 .create = cpu_stop_create,336 .create = cpu_stop_create,
337 .setup = cpu_stop_unpark,337 .setup = cpu_stop_unpark,
338 .park = cpu_stop_park,338 .park = cpu_stop_park,
339 .unpark = cpu_stop_unpark,339 .pre_unpark = cpu_stop_unpark,
340 .selfparking = true,340 .selfparking = true,
341};341};
342 342