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 /include | |
| parent | 06e79d3b45df263984539c417d9c781bdaa31351 (diff) | |
| parent | 46c498c2cdee5efe44f617bcd4f388179be36115 (diff) | |
| download | linux-6516ab6fdffbda656253d4e1231660c3f87f7889.tar.gz | |
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 'include')
| -rw-r--r-- | include/linux/smpboot.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h index c65dee059913..13e929679550 100644 --- a/include/linux/smpboot.h +++ b/include/linux/smpboot.h @@ -24,6 +24,9 @@ struct smpboot_thread_data; * parked (cpu offline) * @unpark: Optional unpark function, called when the thread is * unparked (cpu online) + * @pre_unpark: Optional unpark function, called before the thread is + * unparked (cpu online). This is not guaranteed to be + * called on the target cpu of the thread. Careful! * @selfparking: Thread is not parked by the park function. * @thread_comm: The base name of the thread */ @@ -37,6 +40,7 @@ struct smp_hotplug_thread { void (*cleanup)(unsigned int cpu, bool online); void (*park)(unsigned int cpu); void (*unpark)(unsigned int cpu); + void (*pre_unpark)(unsigned int cpu); bool selfparking; const char *thread_comm; }; |