[tip:x86/cleanups] x86/MSR: Move native_* variants to msr.h

[tip-bot for Borislav Petkov]

Commit-ID:  c996f3802006a585a6c3f8eaa73e375330efc0e7
Gitweb: https://git.kernel.org/tip/c996f3802006a585a6c3f8eaa73e375330efc0e7
Author: Borislav Petkov 
AuthorDate: Thu, 1 Mar 2018 16:13:36 +0100
Committer:  Thomas Gleixner 
CommitDate: Thu, 8 Mar 2018 10:22:57 +0100

x86/MSR: Move native_* variants to msr.h

... where they belong.

No functional change.

Signed-off-by: Borislav Petkov 
Signed-off-by: Thomas Gleixner 
Reviewed-by: Darren Kenny 
Cc: k...@vger.kernel.org
Link: https://lkml.kernel.org/r/20180301151336.12948-1...@alien8.de

---
 arch/x86/include/asm/microcode.h | 14 --
 arch/x86/include/asm/msr.h   | 14 ++
 arch/x86/kvm/svm.c   |  1 -
 arch/x86/kvm/vmx.c   |  1 -
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 7fb1047d61c7..871714e2e4c6 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -6,20 +6,6 @@
 #include 
 #include 
 
-#define native_rdmsr(msr, val1, val2)  \
-do {   \
-   u64 __val = __rdmsr((msr)); \
-   (void)((val1) = (u32)__val);\
-   (void)((val2) = (u32)(__val >> 32));\
-} while (0)
-
-#define native_wrmsr(msr, low, high)   \
-   __wrmsr(msr, low, high)
-
-#define native_wrmsrl(msr, val)\
-   __wrmsr((msr), (u32)((u64)(val)),   \
-  (u32)((u64)(val) >> 32))
-
 struct ucode_patch {
struct list_head plist;
void *data; /* Intel uses only this one */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 30df295f6d94..77254c9c8f61 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -108,6 +108,20 @@ static inline void notrace __wrmsr(unsigned int msr, u32 
low, u32 high)
 : : "c" (msr), "a"(low), "d" (high) : "memory");
 }
 
+#define native_rdmsr(msr, val1, val2)  \
+do {   \
+   u64 __val = __rdmsr((msr)); \
+   (void)((val1) = (u32)__val);\
+   (void)((val2) = (u32)(__val >> 32));\
+} while (0)
+
+#define native_wrmsr(msr, low, high)   \
+   __wrmsr(msr, low, high)
+
+#define native_wrmsrl(msr, val)\
+   __wrmsr((msr), (u32)((u64)(val)),   \
+  (u32)((u64)(val) >> 32))
+
 static inline unsigned long long native_read_msr(unsigned int msr)
 {
unsigned long long val;
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index be9c839e2c89..9d2043f94e29 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -49,7 +49,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 051dab74e4e9..ee5ed44bc284 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -51,7 +51,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "trace.h"

[tip:x86/cleanups] x86/MSR: Move native_* variants to msr.h

[tip-bot for Borislav Petkov]

Commit-ID:  c996f3802006a585a6c3f8eaa73e375330efc0e7
Gitweb: https://git.kernel.org/tip/c996f3802006a585a6c3f8eaa73e375330efc0e7
Author: Borislav Petkov 
AuthorDate: Thu, 1 Mar 2018 16:13:36 +0100
Committer:  Thomas Gleixner 
CommitDate: Thu, 8 Mar 2018 10:22:57 +0100

x86/MSR: Move native_* variants to msr.h

... where they belong.

No functional change.

Signed-off-by: Borislav Petkov 
Signed-off-by: Thomas Gleixner 
Reviewed-by: Darren Kenny 
Cc: k...@vger.kernel.org
Link: https://lkml.kernel.org/r/20180301151336.12948-1...@alien8.de

---
 arch/x86/include/asm/microcode.h | 14 --
 arch/x86/include/asm/msr.h   | 14 ++
 arch/x86/kvm/svm.c   |  1 -
 arch/x86/kvm/vmx.c   |  1 -
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 7fb1047d61c7..871714e2e4c6 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -6,20 +6,6 @@
 #include 
 #include 
 
-#define native_rdmsr(msr, val1, val2)  \
-do {   \
-   u64 __val = __rdmsr((msr)); \
-   (void)((val1) = (u32)__val);\
-   (void)((val2) = (u32)(__val >> 32));\
-} while (0)
-
-#define native_wrmsr(msr, low, high)   \
-   __wrmsr(msr, low, high)
-
-#define native_wrmsrl(msr, val)\
-   __wrmsr((msr), (u32)((u64)(val)),   \
-  (u32)((u64)(val) >> 32))
-
 struct ucode_patch {
struct list_head plist;
void *data; /* Intel uses only this one */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 30df295f6d94..77254c9c8f61 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -108,6 +108,20 @@ static inline void notrace __wrmsr(unsigned int msr, u32 
low, u32 high)
 : : "c" (msr), "a"(low), "d" (high) : "memory");
 }
 
+#define native_rdmsr(msr, val1, val2)  \
+do {   \
+   u64 __val = __rdmsr((msr)); \
+   (void)((val1) = (u32)__val);\
+   (void)((val2) = (u32)(__val >> 32));\
+} while (0)
+
+#define native_wrmsr(msr, low, high)   \
+   __wrmsr(msr, low, high)
+
+#define native_wrmsrl(msr, val)\
+   __wrmsr((msr), (u32)((u64)(val)),   \
+  (u32)((u64)(val) >> 32))
+
 static inline unsigned long long native_read_msr(unsigned int msr)
 {
unsigned long long val;
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index be9c839e2c89..9d2043f94e29 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -49,7 +49,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 051dab74e4e9..ee5ed44bc284 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -51,7 +51,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "trace.h"