x86/asm: Include msr-index.h rather than msr.h

There is nothing interesting for assembly code in msr.h.  Include msr-index.h
instead, and drop the __ASSEMBLY__ guards in msr.h.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index d78bed394affc3680f5d8ba632fe3384257d7005..ab2d52a79dd509d9404a8f726a92d755cf8c0a74 100644 (file)
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -6,7 +6,7 @@
 #include <asm/fixmap.h>
 #include <asm/page.h>
 #include <asm/processor.h>
-#include <asm/msr.h>
+#include <asm/msr-index.h>
 #include <asm/cpufeature.h>
 #include <public/elfnote.h>
 

diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S
index 4d527dbfce8448ed4decd63832ccf0da3428d677..5bf61d5c2d2a164657f972331580b209058ed728 100644 (file)
--- a/xen/arch/x86/x86_64/kexec_reloc.S
+++ b/xen/arch/x86/x86_64/kexec_reloc.S
@@ -16,7 +16,7 @@
 #include <xen/kimage.h>
 
 #include <asm/asm_defns.h>
-#include <asm/msr.h>
+#include <asm/msr-index.h>
 #include <asm/page.h>
 #include <asm/machine_kexec.h>
 

diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h
index 3cbbc65e02ac31d0e2e1e5ff1034399b1cfc68be..bca41a367057e47fe023e8a0c76624654895e8e8 100644 (file)
--- a/xen/include/asm-x86/msr.h
+++ b/xen/include/asm-x86/msr.h
@@ -3,8 +3,6 @@
 
 #include "msr-index.h"
 
-#ifndef __ASSEMBLY__
-
 #include <xen/types.h>
 #include <xen/percpu.h>
 #include <xen/errno.h>
@@ -336,6 +334,4 @@ int init_vcpu_msr_policy(struct vcpu *v);
 int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val);
 int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val);
 
-#endif /* !__ASSEMBLY__ */
-
 #endif /* __ASM_MSR_H */