diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 14:30:42 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 14:30:42 +0100 |
| commit | fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08 (patch) | |
| tree | 0b0d53c6976925edfb4f33d73fdfd3022f938b29 /kernel/smpboot.c | |
| parent | c451e6d4bd290db5290cfa7f9c4079386373645b (diff) | |
| parent | 856a850afdd778fad7ded4240d333a8c3b05b136 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'kernel/smpboot.c')
| -rw-r--r-- | kernel/smpboot.c | 2 |
1 files changed, 2 insertions, 0 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); } |