From 2a2adc76f61636ba2f0dbe204d5daf15edf7ae6d Mon Sep 17 00:00:00 2001 From: Xiangyang Wu Date: Thu, 12 Jul 2018 15:50:48 +0800 Subject: [PATCH] HV:CPU:Fix a mistake introduced by MARCO replacing patch Fixs: 7fd3c624 (HV:CPU:Constant values replace with CPU MACRO) There is a mistake in the previous MARCO replacing patch, use CR4 value replaces CR0 MACRO. Use CR0 value replaces CR0 MACRO. Signed-off-by: Xiangyang Wu Reviewed-by: Yin Fengwei --- hypervisor/arch/x86/wakeup.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypervisor/arch/x86/wakeup.S b/hypervisor/arch/x86/wakeup.S index f3bc2c994..7b0c93155 100644 --- a/hypervisor/arch/x86/wakeup.S +++ b/hypervisor/arch/x86/wakeup.S @@ -121,8 +121,8 @@ restore_s3_context: mov 0x88 + cpu_ctx(%rip), %rax mov %rax, %cr3 - /*144U=0x90=CPU_CONTEXT_OFFSET_CR4*/ - mov 0x90 + cpu_ctx(%rip), %rax + /*120U=0x78=CPU_CONTEXT_OFFSET_CR0*/ + mov 0x78 + cpu_ctx(%rip), %rax mov %rax, %cr0 /*504U=0x1f8=CPU_CONTEXT_OFFSET_IDTR*/