From 1651f9d907834fa86d3d4e21410c35bf79cbc81d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 9 Jul 2012 13:50:23 +0200
Subject: [PATCH] --- yaml --- r: 320465 b: refs/heads/master c:
 597ed953d7db28528b4687e46388c1aa905c14bd h: refs/heads/master i:   320463:
 c6d86850f0387d8bd3eaffbfe285d66d75194536 v: v3

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

diff --git a/[refs] b/[refs]
index 33785df594ad..3d339c3e03a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74e6543fdc4e7553f572f7898ade649a09d85049
+refs/heads/master: 597ed953d7db28528b4687e46388c1aa905c14bd
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.h b/trunk/arch/x86/kernel/cpu/perf_event.h
index a15df4be151f..821d53b696d1 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.h
+++ b/trunk/arch/x86/kernel/cpu/perf_event.h
@@ -374,7 +374,7 @@ struct x86_pmu {
 	/*
 	 * Intel DebugStore bits
 	 */
-	int		bts		:1,
+	unsigned int	bts		:1,
 			bts_active	:1,
 			pebs		:1,
 			pebs_active	:1,