diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-07-22 13:41:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-14 11:53:02 +0200 |
| commit | 7fdba1ca10462f42ad2246b918fe6368f5ce488e (patch) | |
| tree | 6cdb2d8c57da4dde9df3aa22bd4839151884dba6 /arch/x86/kernel/cpu/perf_event_intel.c | |
| parent | bdc2209fd246820de2816691ac0e82600885e1a8 (diff) | |
| download | linux-7fdba1ca10462f42ad2246b918fe6368f5ce488e.tar.gz linux-7fdba1ca10462f42ad2246b918fe6368f5ce488e.tar.xz linux-7fdba1ca10462f42ad2246b918fe6368f5ce488e.zip | |
perf, x86: Avoid kfree() in CPU_STARTING
On -rt kfree() can schedule, but CPU_STARTING is before the CPU is
fully up and running. These are contradictory, so avoid it. Instead
push the kfree() to CPU_ONLINE where we're free to schedule.
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-kwd4j6ayld5thrscvaxgjquv@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index f88af2c2a561..3751494e70f5 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -1362,7 +1362,7 @@ static void intel_pmu_cpu_starting(int cpu) pc = per_cpu(cpu_hw_events, i).shared_regs; if (pc && pc->core_id == core_id) { - kfree(cpuc->shared_regs); + cpuc->kfree_on_online = cpuc->shared_regs; cpuc->shared_regs = pc; break; } |