Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3905bb2a authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

xen: restore runstate_info even if !have_vcpu_info_placement 



Even if have_vcpu_info_placement is not set, we still need to set up
the runstate area on each resumed vcpu.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
parent be012920

arch/x86/xen/enlighten.c

+11 −14
Original line number Original line Diff line number Diff line
@@ -138,7 +138,6 @@ static void xen_vcpu_setup(int cpu) 
 */

 */

void xen_vcpu_restore(void)

void xen_vcpu_restore(void)

{

{

	if (have_vcpu_info_placement) {

	int cpu;

	int cpu;





	for_each_online_cpu(cpu) {

	for_each_online_cpu(cpu) {
@@ -150,15 +149,13 @@ void xen_vcpu_restore(void) 




		xen_setup_runstate_info(cpu);

		xen_setup_runstate_info(cpu);





		if (have_vcpu_info_placement)

			xen_vcpu_setup(cpu);

			xen_vcpu_setup(cpu);





		if (other_cpu &&

		if (other_cpu &&

		    HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))

		    HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))

			BUG();

			BUG();

	}

	}



		BUG_ON(!have_vcpu_info_placement);

	}

}

}





static void __init xen_banner(void)

static void __init xen_banner(void)