Now there is a local header, asm/cpu-user-regs.h is a far better place for
these to live.
No functional change.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
---
xen/arch/x86/include/asm/cpu-user-regs.h | 11 +++++++++++
xen/arch/x86/include/asm/msr.h | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h
b/xen/arch/x86/include/asm/cpu-user-regs.h
index d700a3ef3447..5b283a2f6d02 100644
--- a/xen/arch/x86/include/asm/cpu-user-regs.h
+++ b/xen/arch/x86/include/asm/cpu-user-regs.h
@@ -55,4 +55,15 @@ struct cpu_user_regs
*/
};
+static inline uint64_t msr_fold(const struct cpu_user_regs *regs)
+{
+ return (regs->rdx << 32) | regs->eax;
+}
+
+static inline void msr_split(struct cpu_user_regs *regs, uint64_t val)
+{
+ regs->rdx = val >> 32;
+ regs->rax = (uint32_t)val;
+}
+
#endif /* X86_CPU_USER_REGS_H */
diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h
index 1c0e768d9123..4aeb06f6524d 100644
--- a/xen/arch/x86/include/asm/msr.h
+++ b/xen/arch/x86/include/asm/msr.h
@@ -113,17 +113,6 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t
val)
return -EFAULT;
}
-static inline uint64_t msr_fold(const struct cpu_user_regs *regs)
-{
- return (regs->rdx << 32) | regs->eax;
-}
-
-static inline void msr_split(struct cpu_user_regs *regs, uint64_t val)
-{
- regs->rdx = val >> 32;
- regs->rax = (uint32_t)val;
-}
-
#define rdpmc(counter,low,high) \
__asm__ __volatile__("rdpmc" \
: "=a" (low), "=d" (high) \
--
2.39.5
