From 66c98c1af86576d79348aec639070bc45e19b4cc Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:07 +0100
Subject: [PATCH] --- yaml --- r: 79930 b: refs/heads/master c:
 b8d1fae7dbde6a1227fa142acecb48dc3dd63817 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-x86/msr.h      | 6 +++---
 trunk/include/asm-x86/paravirt.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 33fdcffdd4e7..0ef46f073ef7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f12dea6135d0a55b151dcb4c6bbe211f5f8d35d
+refs/heads/master: b8d1fae7dbde6a1227fa142acecb48dc3dd63817
diff --git a/trunk/include/asm-x86/msr.h b/trunk/include/asm-x86/msr.h
index b6262e99fc8e..effb7319c0a5 100644
--- a/trunk/include/asm-x86/msr.h
+++ b/trunk/include/asm-x86/msr.h
@@ -94,10 +94,10 @@ static inline unsigned long long native_read_tsc(void)
 	return val;
 }
 
-static inline unsigned long long native_read_pmc(void)
+static inline unsigned long long native_read_pmc(int counter)
 {
 	unsigned long long val;
-	asm volatile("rdpmc" : "=A" (val));
+	asm volatile("rdpmc" : "=A" (val) : "c" (counter));
 	return val;
 }
 
@@ -154,7 +154,7 @@ static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high)
 
 #define rdpmc(counter,low,high)					\
 	do {							\
-		u64 _l = native_read_pmc();			\
+		u64 _l = native_read_pmc(counter);		\
 		(low)  = (u32)_l;				\
 		(high) = (u32)(_l >> 32);			\
 	} while(0)
diff --git a/trunk/include/asm-x86/paravirt.h b/trunk/include/asm-x86/paravirt.h
index d1780e32722e..4782be68d0fa 100644
--- a/trunk/include/asm-x86/paravirt.h
+++ b/trunk/include/asm-x86/paravirt.h
@@ -118,7 +118,7 @@ struct pv_cpu_ops {
 	int (*write_msr)(unsigned int msr, u64 val);
 
 	u64 (*read_tsc)(void);
-	u64 (*read_pmc)(void);
+	u64 (*read_pmc)(int counter);
 
 	/* These two are jmp to, not actually called. */
 	void (*irq_enable_syscall_ret)(void);