From 5d689f5c86987bab32bb4fcaa777a7734eb16ebd Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Tue, 21 Jul 2009 00:55:05 -0700
Subject: [PATCH] --- yaml --- r: 155720 b: refs/heads/master c:
 c9f73a3dd27e03411f18a58c0814d51392d2b17a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b0f9393348e..cbac54fcd860 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b7019ae6a542a801a80df6694c66e240e2c3e39
+refs/heads/master: c9f73a3dd27e03411f18a58c0814d51392d2b17a
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index 5c6fae4f43d8..ff854fd89a81 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -2666,6 +2666,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)