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

Commit 801fd14a authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

xen: use vcpu_ops to setup cpu masks 



Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 98511f35

arch/x86/xen/smp.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -156,11 +156,16 @@ static void __init xen_fill_possible_map(void) 
{

{

	int i, rc;

	int i, rc;





	num_processors = 0;

	disabled_cpus = 0;

	for (i = 0; i < nr_cpu_ids; i++) {

	for (i = 0; i < nr_cpu_ids; i++) {

		rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);

		rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);

		if (rc >= 0) {

		if (rc >= 0) {

			num_processors++;

			num_processors++;

			set_cpu_possible(i, true);

			set_cpu_possible(i, true);

		} else {

			set_cpu_possible(i, false);

			set_cpu_present(i, false);

		}

		}

	}

	}

}

}
@@ -190,6 +195,8 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus) 
	if (xen_smp_intr_init(0))

	if (xen_smp_intr_init(0))

		BUG();

		BUG();





	xen_fill_possible_map();



	if (!alloc_cpumask_var(&xen_cpu_initialized_map, GFP_KERNEL))

	if (!alloc_cpumask_var(&xen_cpu_initialized_map, GFP_KERNEL))

		panic("could not allocate xen_cpu_initialized_map\n");

		panic("could not allocate xen_cpu_initialized_map\n");
@@ -480,6 +487,5 @@ static const struct smp_ops xen_smp_ops __initdata = { 
void __init xen_smp_init(void)

void __init xen_smp_init(void)

{

{

	smp_ops = xen_smp_ops;

	smp_ops = xen_smp_ops;

	xen_fill_possible_map();

	xen_init_spinlocks();

	xen_init_spinlocks();

}
 
}