Commit-ID: 73bf1b62f561fc8ecb00e2810efe4fe769f4933e Gitweb: http://git.kernel.org/tip/73bf1b62f561fc8ecb00e2810efe4fe769f4933e Author: "Markus Metzger" <markus.t.metzger@xxxxxxxxx> AuthorDate: Thu, 5 Mar 2009 08:57:21 +0100 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 6 Mar 2009 16:13:15 +0100 x86, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs() ds_write_config() can write the BTS as well as the PEBS part of the DS config. ds_request_pebs() passes the wrong qualifier, which results in the wrong configuration to be written. Reported-by: Stephane Eranian <eranian@xxxxxxxxxxxxxx> Signed-off-by: Markus Metzger <markus.t.metzger@xxxxxxxxx> LKML-Reference: <20090305085721.A22550@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/kernel/ds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c index de7cdbd..87b67e3 100644 --- a/arch/x86/kernel/ds.c +++ b/arch/x86/kernel/ds.c @@ -729,7 +729,7 @@ struct pebs_tracer *ds_request_pebs(struct task_struct *task, spin_unlock_irqrestore(&ds_lock, irq); - ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_bts); + ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_pebs); ds_resume_pebs(tracer); return tracer; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html