[SRU,Xenial,1/1] UBUNTU: SAUCE: kaiser: fix perf crashes - fix to original commit

Message ID 713e68a6ec2959f31ad4cbcc7f0ca70b9b621b29.1515512354.git.joseph.salisbury@canonical.com
State New
Headers show
Series
  • [SRU,Xenial,1/1] UBUNTU: SAUCE: kaiser: fix perf crashes - fix to original commit
Related show

Commit Message

Joseph Salisbury Jan. 9, 2018, 4:19 p.m.
BugLink: http://bugs.launchpad.net/bugs/1741934

There was a back port of upstream 4.4 stable commit 20cbe9a3aa2e341824da57ce0ac6d52cbffaa570
to Xenial which failed remove a kfree() from release_ds_buffer().    

This commit does only that.  It removes this extra kfree().  This left over 
kfree was causing a kernel trace on many systems as reported in the bug.

This commit removes the kfree() like it should have been in the original commit.  


Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 arch/x86/events/intel/ds.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Marcelo Henrique Cerri Jan. 9, 2018, 4:45 p.m. | #1
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

Patch

diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index c236f3d..6eca9fb 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -415,7 +415,6 @@  static void release_ds_buffer(int cpu)
 		return;
 
 	per_cpu(cpu_hw_events, cpu).ds = NULL;
-	kfree(ds);
 }
 
 void release_ds_buffers(void)