diff options
| author | Vincent Stehlé <vincent.stehle@intel.com> | 2016-05-24 16:53:49 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-05-25 10:56:43 +0200 |
| commit | 275ae411e56f8f900fa364da29c4706f9af4e1f3 (patch) | |
| tree | 48f0835278f71d4830b7a05654f5f30a384a30c3 /arch | |
| parent | Merge tag 'perf-core-for-mingo-20160523' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-275ae411e56f8f900fa364da29c4706f9af4e1f3.tar.xz linux-275ae411e56f8f900fa364da29c4706f9af4e1f3.zip | |
perf/x86/intel/rapl: Fix pmus free during cleanup
On rapl cleanup path, kfree() is given by mistake the address of the
pointer of the structure to free (rapl_pmus->pmus + i). Pass the pointer
instead (rapl_pmus->pmus[i]).
Fixes: 9de8d686955b "perf/x86/intel/rapl: Convert it to a per package facility"
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1464101629-14905-1-git-send-email-vincent.stehle@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/events/intel/rapl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 99c4bab123cd..e30eef4f29a6 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -714,7 +714,7 @@ static void cleanup_rapl_pmus(void) int i; for (i = 0; i < rapl_pmus->maxpkg; i++) - kfree(rapl_pmus->pmus + i); + kfree(rapl_pmus->pmus[i]); kfree(rapl_pmus); } |