summaryrefslogtreecommitdiff
path: root/include/linux/smpboot.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-20 17:30:42 +0400
committerJohannes Berg <johannes.berg@intel.com>2013-03-20 17:30:42 +0400
commitfc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08 (patch)
tree0b0d53c6976925edfb4f33d73fdfd3022f938b29 /include/linux/smpboot.h
parentc451e6d4bd290db5290cfa7f9c4079386373645b (diff)
parent856a850afdd778fad7ded4240d333a8c3b05b136 (diff)
downloadlinux-fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08.tar.xz
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'include/linux/smpboot.h')
-rw-r--r--include/linux/smpboot.h4
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;
};