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

Commit 2af51a3f authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: Use accessors code.: ia64 



Impact: use new API

Use the accessors rather than frobbing bits directly.  Most of this is
in arch code I haven't even compiled, but is straightforward.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
parent 5dd3c994

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ __init void prefill_possible_map(void) 
		possible, max((possible - available_cpus), 0));



	for (i = 0; i < possible; i++)

		cpu_set(i, cpu_possible_map);

		set_cpu_possible(i, true);

}



int acpi_map_lsapic(acpi_handle handle, int *pcpu)

arch/ia64/kernel/smpboot.c

+7 −10
Original line number Diff line number Diff line
@@ -581,14 +581,14 @@ smp_build_cpu_map (void) 


	ia64_cpu_to_sapicid[0] = boot_cpu_id;

	cpus_clear(cpu_present_map);

	cpu_set(0, cpu_present_map);

	cpu_set(0, cpu_possible_map);

	set_cpu_present(0, true);

	set_cpu_possible(0, true);

	for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {

		sapicid = smp_boot_data.cpu_phys_id[i];

		if (sapicid == boot_cpu_id)

			continue;

		cpu_set(cpu, cpu_present_map);

		cpu_set(cpu, cpu_possible_map);

		set_cpu_present(cpu, true);

		set_cpu_possible(cpu, true);

		ia64_cpu_to_sapicid[cpu] = sapicid;

		cpu++;

	}
@@ -626,12 +626,9 @@ smp_prepare_cpus (unsigned int max_cpus) 
	 */

	if (!max_cpus) {

		printk(KERN_INFO "SMP mode deactivated.\n");

		cpus_clear(cpu_online_map);

		cpus_clear(cpu_present_map);

		cpus_clear(cpu_possible_map);

		cpu_set(0, cpu_online_map);

		cpu_set(0, cpu_present_map);

		cpu_set(0, cpu_possible_map);

		init_cpu_online(cpumask_of(0));

		init_cpu_present(cpumask_of(0));

		init_cpu_possible(cpumask_of(0));

		return;

	}

}