From 0d5e83c79668300bf3b3b88247b9d6dfcda2528e Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 13 Apr 2010 22:23:15 +0200
Subject: [PATCH] --- yaml --- r: 191295 b: refs/heads/master c:
 a1f2b70a942b8d858a0ab02567da3999b60a99b2 h: refs/heads/master i:   191293:
 d4176ed28f6c6f4b9b1c0baa682eac23fcbbc3bc   191291:
 084466dc828dd5d5beb8900ce309c9aa4ed6e759   191287:
 2594329958723e2c279706f1992af04bc83ab9d0   191279:
 7c52e8e2fdf4912790e64b4de5c90c4ad2dab164   191263:
 81def82ad973b63a8c06a05d7d0ebdf1847a9104   191231:
 296ac94f2f54879f2eef138c0d784662292c2c68 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e8981837888..12d2cf0b852f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31fa58af57c41d2912debf62d47d5811062411f1
+refs/heads/master: a1f2b70a942b8d858a0ab02567da3999b60a99b2
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
index 4e218d7ac852..4a3f1f2b9b91 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -170,7 +170,7 @@ struct cpu_hw_events {
 	EVENT_CONSTRAINT(0, 0, 0)
 
 #define for_each_event_constraint(e, c)	\
-	for ((e) = (c); (e)->cmask; (e)++)
+	for ((e) = (c); (e)->weight; (e)++)
 
 union perf_capabilities {
 	struct {