- Fix segfault tracing transactions in Intel PT (Adrian Hunter)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXFOtpAAoJENZQFvNTUqpAQK4P/1DZttzXWtDQAy38z85JnANu
 aC9LHUtmPdREF51ynAjJ55jbwkEiOV9rQaLMnIXgIw7S3Qv2SDtcqhK4qECg9XO/
 5SxI3Qp4+sp7SZZDAG5LxP8Oy/lfhGlXr8++gEr7yk3bar5wGnnWrAvY66/uuxyK
 ELLQ5z/TOPWCKksZxxwC3ZufGdA4CNzEEBmbJ+B9kYNnzH61Z1Rix1GUQM1iYD64
 jbD7zt0JkPJFhCbRsuqG46Yyt57wcOuz7Ve4a7twf4RMu04FeKheOlEB1eVdk22U
 q9NnTWNNcgRpaKsKpaWe+8LFFQ8jSxynClcgmbnNtXBtsPlNQSqGj2nObtcZSwcs
 pRatlwqIPjKj92/VK9GWer5tkdeAqaRTWkP5dxQqzzUAjbUQ7O+u/jMH3S67yWpv
 6SbhYqF0DpCTDnX25yhbNWSgpOlQTDN0HASqXzWCnnZ0MXDGSb01nbe1pSa4kAtX
 OGtAe5ZNP60IJTfb5njFh7AsrEX3ITNVWwgS08gVjsl2QjGN4DogRCW2CCJmDpaN
 q2ZKx3uKLSJziqLfbTonvwzEep1bSLRaue6RZQTW0YSp1SWcVRGb7pjWkhpPgTpc
 HQM1GRyHElhWTLh4CNDcIOc8vgY3qdDKcqUJzQWNSWHfmqMW4mIvEVUyvX1e0e1U
 o34sy/O2JBCgMTOnGDYL
 =F7NR
 -----END PGP SIGNATURE-----

Merge tag 'perf-urgent-for-mingo-20160418' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull a perf/urgent fix from Arnaldo Carvalho de Melo:

- Fix segfault tracing transactions in Intel PT (Adrian Hunter)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-04-19 08:41:59 +02:00
Родитель c3b46c7326 1342e0b7a6
Коммит a19cad6d66
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -1130,7 +1130,7 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
pr_err("Intel Processor Trace: failed to deliver transaction event, error %d\n",
ret);
if (pt->synth_opts.callchain)
if (pt->synth_opts.last_branch)
intel_pt_reset_last_branch_rb(ptq);
return ret;