diff options
| author | Yong Zhang <yong.zhang0@gmail.com> | 2011-07-28 03:16:00 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:35 (GMT) |
| commit | fda46064abe2b94faafa5db1d6d66d97f006ae85 (patch) | |
| tree | c7b61529369cf145ac3ca1c3d168080dc6f53e44 /kernel/cpu.c | |
| parent | 9a8d18d3b70c6723aa019df25e32b818c624dd4a (diff) | |
| download | linux-fsl-qoriq-fda46064abe2b94faafa5db1d6d66d97f006ae85.tar.xz | |
hotplug: Reread hotplug_pcp on pin_current_cpu() retry
When retry happens, it's likely that the task has been migrated to
another cpu (except unplug failed), but it still derefernces the
original hotplug_pcp per cpu data.
Update the pointer to hotplug_pcp in the retry path, so it points to
the current cpu.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110728031600.GA338@windriver.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 3a4652d..a2518ae 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -81,9 +81,11 @@ static DEFINE_PER_CPU(struct hotplug_pcp, hotplug_pcp); */ void pin_current_cpu(void) { - struct hotplug_pcp *hp = &__get_cpu_var(hotplug_pcp); + struct hotplug_pcp *hp; retry: + hp = &__get_cpu_var(hotplug_pcp); + if (!hp->unplug || hp->refcount || preempt_count() > 1 || hp->unplug == current) { hp->refcount++; |