From 64518bce64418bf3c8bceb972c7ecfc77042a1d2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 29 Jul 2009 15:38:00 -0700
Subject: [PATCH] --- yaml --- r: 162183 b: refs/heads/master c:
 4a66384567dfa68fb0bf6604842b1262e601d4a2 h: refs/heads/master i:   162181:
 aa183cc01f5a9d0679948d430664c9ff62160f54   162179:
 336230ed66577f9e056d19cdf176748dfe3211b6   162175:
 c83c15fa9499a951228d44bf1cdae98e0b6fba7f v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/hv/Hv.h          |  4 +--
 trunk/drivers/staging/hv/include/osd.h | 35 --------------------------
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/[refs] b/[refs]
index 82e85b71622c..b72f6122428d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f931a70c370cc826191a51a79500b34cd592b25b
+refs/heads/master: 4a66384567dfa68fb0bf6604842b1262e601d4a2
diff --git a/trunk/drivers/staging/hv/Hv.h b/trunk/drivers/staging/hv/Hv.h
index b5ea3dcc6f1b..694c96b8b06b 100644
--- a/trunk/drivers/staging/hv/Hv.h
+++ b/trunk/drivers/staging/hv/Hv.h
@@ -133,14 +133,14 @@ static inline unsigned long long ReadMsr(int msr)
 {
 	unsigned long long val;
 
-	RDMSR(msr, val);
+	rdmsrl(msr, val);
 
 	return val;
 }
 
 static inline void WriteMsr(int msr, u64 val)
 {
-	WRMSR(msr, val);
+	wrmsrl(msr, val);
 
 	return;
 }
diff --git a/trunk/drivers/staging/hv/include/osd.h b/trunk/drivers/staging/hv/include/osd.h
index 0444c18990d0..a3e2e29cf331 100644
--- a/trunk/drivers/staging/hv/include/osd.h
+++ b/trunk/drivers/staging/hv/include/osd.h
@@ -66,41 +66,6 @@ struct osd_timer {
 };
 
 
-
-#ifdef __x86_64__
-
-#define RDMSR(reg, v) {                                                        \
-    u32 h, l;                                                                 \
-     __asm__ __volatile__("rdmsr"                                                               \
-    : "=a" (l), "=d" (h)                                                       \
-    : "c" (reg));                                                              \
-    v = (((u64)h) << 32) | l;                                                         \
-}
-
-#define WRMSR(reg, v) {                                                        \
-    u32 h, l;                                                               \
-    l = (u32)(((u64)(v)) & 0xFFFFFFFF);                                  \
-    h = (u32)((((u64)(v)) >> 32) & 0xFFFFFFFF);                          \
-     __asm__ __volatile__("wrmsr"                                              \
-    : /* no outputs */                                                         \
-    : "c" (reg), "a" (l), "d" (h));                                            \
-}
-
-#else
-
-#define RDMSR(reg, v) 			                                               \
-     __asm__ __volatile__("rdmsr" 	                                           \
-    : "=A" (v) 			                                                       \
-    : "c" (reg))
-
-#define WRMSR(reg, v) 			                                               \
-     __asm__ __volatile__("wrmsr" 	                                           \
-    : /* no outputs */ 				                                           \
-    : "c" (reg), "A" ((u64)v))
-
-#endif
-
-
 /* Osd routines */
 
 extern void* VirtualAllocExec(unsigned int size);