diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:04:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:04:55 -0800 |
| commit | bcbd818c069b9e1bf82517401225b152a33968e2 (patch) | |
| tree | 3fcdcf02b15fdd77998589a6158d0e36ba137d1c /kernel/cpu.c | |
| parent | d652e1eb8e7b739fccbfb503a3da3e9f640fbf3d (diff) | |
| parent | 14e568e78f6f80ca1e27256641ddf524c7dbdc51 (diff) | |
| download | linux-bcbd818c069b9e1bf82517401225b152a33968e2.tar.gz linux-bcbd818c069b9e1bf82517401225b152a33968e2.tar.bz2 linux-bcbd818c069b9e1bf82517401225b152a33968e2.zip | |
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull preparatory smp/hotplug patches from Ingo Molnar:
"Some early preparatory changes for the WIP hotplug rework by Thomas
Gleixner."
* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
stop_machine: Use smpboot threads
stop_machine: Store task reference in a separate per cpu variable
smpboot: Allow selfparking per cpu threads
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index e5d5e8e1e030..b5e4ab2d427e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -256,6 +256,8 @@ static int __ref take_cpu_down(void *_param) return err; cpu_notify(CPU_DYING | param->mod, param->hcpu); + /* Park the stopper thread */ + kthread_park(current); return 0; } |