From: Andrew Cooper Date: Fri, 15 Jul 2022 12:39:29 +0000 (+0100) Subject: xen/wait: Drop vestigial remnants of TRAP_regs_partial X-Git-Tag: 4.17.0-rc1~275 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7a105f7c76db2f8f457bb790271e01f75641bf05;p=xen.git xen/wait: Drop vestigial remnants of TRAP_regs_partial The preservation of entry_vector was introduced with ecf9846a6a20 ("x86: save/restore only partial register state where possible") where TRAP_regs_partial was introduced, but missed from f9eb74789af7 ("x86/entry: Remove support for partial cpu_user_regs frames") where TRAP_regs_partial was removed. Fixes: f9eb74789af7 ("x86/entry: Remove support for partial cpu_user_regs frames") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/common/wait.c b/xen/common/wait.c index 9276d76464..3ebb884fe7 100644 --- a/xen/common/wait.c +++ b/xen/common/wait.c @@ -124,7 +124,6 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv) struct cpu_info *cpu_info = get_cpu_info(); struct vcpu *curr = current; unsigned long dummy; - u32 entry_vector = cpu_info->guest_cpu_user_regs.entry_vector; ASSERT(wqv->esp == 0); @@ -169,8 +168,6 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv) for ( ; ; ) do_softirq(); } - - cpu_info->guest_cpu_user_regs.entry_vector = entry_vector; } static void __finish_wait(struct waitqueue_vcpu *wqv)