aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/xen/enlighten.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 668bbfee0cce..4466feb4c69b 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -987,7 +987,16 @@ static void xen_write_cr4(unsigned long cr4)
987 987
988 native_write_cr4(cr4); 988 native_write_cr4(cr4);
989} 989}
990 990#ifdef CONFIG_X86_64
991static inline unsigned long xen_read_cr8(void)
992{
993 return 0;
994}
995static inline void xen_write_cr8(unsigned long val)
996{
997 BUG_ON(val);
998}
999#endif
991static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) 1000static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
992{ 1001{
993 int ret; 1002 int ret;
@@ -1156,6 +1165,11 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
1156 .read_cr4_safe = native_read_cr4_safe, 1165 .read_cr4_safe = native_read_cr4_safe,
1157 .write_cr4 = xen_write_cr4, 1166 .write_cr4 = xen_write_cr4,
1158 1167
1168#ifdef CONFIG_X86_64
1169 .read_cr8 = xen_read_cr8,
1170 .write_cr8 = xen_write_cr8,
1171#endif
1172
1159 .wbinvd = native_wbinvd, 1173 .wbinvd = native_wbinvd,
1160 1174
1161 .read_msr = native_read_msr_safe, 1175 .read_msr = native_read_msr_safe,