x86: Clean up efer/ler macros after MSR changes.

Move them out of a header file and make the macros proper functions again.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 2 insertions, 15 deletions

diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h
index 26fded68c0..820a2528e6 100644
--- a/xen/include/asm-x86/msr.h
+++ b/xen/include/asm-x86/msr.h
@@ -102,24 +102,11 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val)
 
 
 DECLARE_PER_CPU(u64, efer);
-
-#define read_efer() this_cpu(efer)
-
-#define write_efer(val) do { \
-    this_cpu(efer) = val; \
-    wrmsrl(MSR_EFER, val); \
-} while(0)
+u64 read_efer(void);
+void write_efer(u64 val);
 
 DECLARE_PER_CPU(u32, ler_msr);
 
-#define ler_enable() do { \
-    u64 debugctl; \
-    if ( !this_cpu(ler_msr) ) \
-        return; \
-    rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl); \
-    wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | 1); \
-} while(0)
-
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_MSR_H */