From 7ac98667d03199138b6beac5835c11759c0c04ae Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Tue, 21 Jul 2009 00:55:05 -0700 Subject: [PATCH] --- yaml --- r: 155619 b: refs/heads/master c: 0dc3d523e8bc4718e0be2e4a742367d6e4be77cd h: refs/heads/master i: 155617: 77cab91cd51fd7123811038cec83d3c0b2cde1a5 155615: 66a6d1b5de70149665280dee2c27a8aea21790f9 v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index baf01e3047db..cf66d2317002 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61fe087059614226978f4d7bb36da26cb2d28f9f +refs/heads/master: 0dc3d523e8bc4718e0be2e4a742367d6e4be77cd diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index a641eb753b8c..7bc888dfd06a 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -2665,6 +2665,7 @@ static void perf_counter_output(struct perf_counter *counter, int nmi, header.size += sizeof(cpu_entry); cpu_entry.cpu = raw_smp_processor_id(); + cpu_entry.reserved = 0; } if (sample_type & PERF_SAMPLE_PERIOD)