From 6a4337c7c7fef8b95d1f79b59dc0e97af26628d1 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Tue, 5 Jun 2012 17:56:50 -0700
Subject: [PATCH] --- yaml --- r: 312221 b: refs/heads/master c:
 1ff4d58a192aea7f245981e2579765f961f6eb9c h: refs/heads/master i:   312219:
 c2958dffcbb459ce6e2b004907dbebf3e2090951 v: v3

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

diff --git a/[refs] b/[refs]
index c39daf435ebd..40d973ed647e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c2ac3fde3e35279958e7b0408e2dcf866465301
+refs/heads/master: 1ff4d58a192aea7f245981e2579765f961f6eb9c
diff --git a/trunk/arch/x86/include/asm/msr.h b/trunk/arch/x86/include/asm/msr.h
index 084ef95274cd..e489c1475be9 100644
--- a/trunk/arch/x86/include/asm/msr.h
+++ b/trunk/arch/x86/include/asm/msr.h
@@ -237,6 +237,8 @@ do {							\
 	(high) = (u32)(_l >> 32);			\
 } while (0)
 
+#define rdpmcl(counter, val) ((val) = native_read_pmc(counter))
+
 #define rdtscp(low, high, aux)					\
 do {                                                            \
 	unsigned long long _val = native_read_tscp(&(aux));     \
diff --git a/trunk/arch/x86/include/asm/paravirt.h b/trunk/arch/x86/include/asm/paravirt.h
index 6cbbabf52707..14ce05dfe04e 100644
--- a/trunk/arch/x86/include/asm/paravirt.h
+++ b/trunk/arch/x86/include/asm/paravirt.h
@@ -252,6 +252,8 @@ do {						\
 	high = _l >> 32;			\
 } while (0)
 
+#define rdpmcl(counter, val) ((val) = paravirt_read_pmc(counter))
+
 static inline unsigned long long paravirt_rdtscp(unsigned int *aux)
 {
 	return PVOP_CALL1(u64, pv_cpu_ops.read_tscp, aux);