diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:07:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:07:12 -0800 |
| commit | 6516ab6fdffbda656253d4e1231660c3f87f7889 (patch) | |
| tree | 516f37c91a7240604153df590eb771bb65384932 /kernel | |
| parent | 06e79d3b45df263984539c417d9c781bdaa31351 (diff) | |
| parent | 46c498c2cdee5efe44f617bcd4f388179be36115 (diff) | |
| download | linux-6516ab6fdffbda656253d4e1231660c3f87f7889.tar.gz linux-6516ab6fdffbda656253d4e1231660c3f87f7889.tar.bz2 linux-6516ab6fdffbda656253d4e1231660c3f87f7889.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/smpboot.c | 2 | ||||
| -rw-r--r-- | kernel/stop_machine.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/smpboot.c b/kernel/smpboot.c index b9bde5727829..25d3d8b6e4e1 100644 --- a/kernel/smpboot.c +++ b/kernel/smpboot.c @@ -209,6 +209,8 @@ static void smpboot_unpark_thread(struct smp_hotplug_thread *ht, unsigned int cp { struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu); + if (ht->pre_unpark) + ht->pre_unpark(cpu); kthread_unpark(tsk); } diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 95d178c62d5a..c09f2955ae30 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -336,7 +336,7 @@ static struct smp_hotplug_thread cpu_stop_threads = { .create = cpu_stop_create, .setup = cpu_stop_unpark, .park = cpu_stop_park, - .unpark = cpu_stop_unpark, + .pre_unpark = cpu_stop_unpark, .selfparking = true, }; |