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

Commit 7d7f9848 authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Linus Torvalds
Browse files

arch/ia64: remove references to cpu_*_map 



This was marked as obsolete for quite a while now..  Now it is time to
remove it altogether.  And while doing this, get rid of first_cpu() as
well.  Also, remove the redundant setting of cpu_online_mask in
smp_prepare_cpus() because the generic code would have already set cpu 0
in cpu_online_mask.

Reported-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38b93780

arch/ia64/kernel/acpi.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -844,7 +844,7 @@ early_param("additional_cpus", setup_additional_cpus); 
 * are onlined, or offlined. The reason is per-cpu data-structures

 * are onlined, or offlined. The reason is per-cpu data-structures

 * are allocated by some modules at init time, and dont expect to

 * are allocated by some modules at init time, and dont expect to

 * do this dynamically on cpu arrival/departure.

 * do this dynamically on cpu arrival/departure.

 * cpu_present_map on the other hand can change dynamically.

 * cpu_present_mask on the other hand can change dynamically.

 * In case when cpu_hotplug is not compiled, then we resort to current

 * In case when cpu_hotplug is not compiled, then we resort to current

 * behaviour, which is cpu_possible == cpu_present.

 * behaviour, which is cpu_possible == cpu_present.

 * - Ashok Raj

 * - Ashok Raj
@@ -922,7 +922,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) 




	acpi_map_cpu2node(handle, cpu, physid);

	acpi_map_cpu2node(handle, cpu, physid);





	cpu_set(cpu, cpu_present_map);

	set_cpu_present(cpu, true);

	ia64_cpu_to_sapicid[cpu] = physid;

	ia64_cpu_to_sapicid[cpu] = physid;





	acpi_processor_set_pdc(handle);

	acpi_processor_set_pdc(handle);
@@ -941,7 +941,7 @@ EXPORT_SYMBOL(acpi_map_lsapic); 
int acpi_unmap_lsapic(int cpu)

int acpi_unmap_lsapic(int cpu)

{

{

	ia64_cpu_to_sapicid[cpu] = -1;

	ia64_cpu_to_sapicid[cpu] = -1;

	cpu_clear(cpu, cpu_present_map);

	set_cpu_present(cpu, false);





#ifdef CONFIG_ACPI_NUMA

#ifdef CONFIG_ACPI_NUMA

	/* NUMA specific cleanup's */

	/* NUMA specific cleanup's */

arch/ia64/kernel/irq_ia64.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static inline int find_unassigned_vector(cpumask_t domain) 
	cpumask_t mask;

	cpumask_t mask;

	int pos, vector;

	int pos, vector;





	cpus_and(mask, domain, cpu_online_map);

	cpumask_and(&mask, &domain, cpu_online_mask);

	if (cpus_empty(mask))

	if (cpus_empty(mask))

		return -EINVAL;

		return -EINVAL;
@@ -141,7 +141,7 @@ static int __bind_irq_vector(int irq, int vector, cpumask_t domain) 
	BUG_ON((unsigned)irq >= NR_IRQS);

	BUG_ON((unsigned)irq >= NR_IRQS);

	BUG_ON((unsigned)vector >= IA64_NUM_VECTORS);

	BUG_ON((unsigned)vector >= IA64_NUM_VECTORS);





	cpus_and(mask, domain, cpu_online_map);

	cpumask_and(&mask, &domain, cpu_online_mask);

	if (cpus_empty(mask))

	if (cpus_empty(mask))

		return -EINVAL;

		return -EINVAL;

	if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain))

	if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain))
@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq) 
	BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED);

	BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED);

	vector = cfg->vector;

	vector = cfg->vector;

	domain = cfg->domain;

	domain = cfg->domain;

	cpus_and(mask, cfg->domain, cpu_online_map);

	cpumask_and(&mask, &cfg->domain, cpu_online_mask);

	for_each_cpu_mask(cpu, mask)

	for_each_cpu_mask(cpu, mask)

		per_cpu(vector_irq, cpu)[vector] = -1;

		per_cpu(vector_irq, cpu)[vector] = -1;

	cfg->vector = IRQ_VECTOR_UNASSIGNED;

	cfg->vector = IRQ_VECTOR_UNASSIGNED;
@@ -322,7 +322,7 @@ void irq_complete_move(unsigned irq) 
	if (unlikely(cpu_isset(smp_processor_id(), cfg->old_domain)))

	if (unlikely(cpu_isset(smp_processor_id(), cfg->old_domain)))

		return;

		return;





	cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map);

	cpumask_and(&cleanup_mask, &cfg->old_domain, cpu_online_mask);

	cfg->move_cleanup_count = cpus_weight(cleanup_mask);

	cfg->move_cleanup_count = cpus_weight(cleanup_mask);

	for_each_cpu_mask(i, cleanup_mask)

	for_each_cpu_mask(i, cleanup_mask)

		platform_send_ipi(i, IA64_IRQ_MOVE_VECTOR, IA64_IPI_DM_INT, 0);

		platform_send_ipi(i, IA64_IRQ_MOVE_VECTOR, IA64_IPI_DM_INT, 0);

arch/ia64/kernel/mca.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1515,7 +1515,8 @@ static void 
ia64_mca_cmc_poll (unsigned long dummy)

ia64_mca_cmc_poll (unsigned long dummy)

{

{

	/* Trigger a CMC interrupt cascade  */

	/* Trigger a CMC interrupt cascade  */

	platform_send_ipi(first_cpu(cpu_online_map), IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CMCP_VECTOR,

							IA64_IPI_DM_INT, 0);

}

}





/*

/*
@@ -1591,7 +1592,8 @@ static void 
ia64_mca_cpe_poll (unsigned long dummy)

ia64_mca_cpe_poll (unsigned long dummy)

{

{

	/* Trigger a CPE interrupt cascade  */

	/* Trigger a CPE interrupt cascade  */

	platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CPEP_VECTOR,

							IA64_IPI_DM_INT, 0);

}

}





#endif /* CONFIG_ACPI */

#endif /* CONFIG_ACPI */

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 
		return irq;

		return irq;





	irq_set_msi_desc(irq, desc);

	irq_set_msi_desc(irq, desc);

	cpus_and(mask, irq_to_domain(irq), cpu_online_map);

	cpumask_and(&mask, &(irq_to_domain(irq)), cpu_online_mask);

	dest_phys_id = cpu_physical_id(first_cpu(mask));

	dest_phys_id = cpu_physical_id(first_cpu(mask));

	vector = irq_to_vector(irq);

	vector = irq_to_vector(irq);
@@ -179,7 +179,7 @@ msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) 
	unsigned dest;

	unsigned dest;

	cpumask_t mask;

	cpumask_t mask;





	cpus_and(mask, irq_to_domain(irq), cpu_online_map);

	cpumask_and(&mask, &(irq_to_domain(irq)), cpu_online_mask);

	dest = cpu_physical_id(first_cpu(mask));

	dest = cpu_physical_id(first_cpu(mask));





	msg->address_hi = 0;

	msg->address_hi = 0;

arch/ia64/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -486,7 +486,7 @@ mark_bsp_online (void) 
{

{

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	/* If we register an early console, allow CPU 0 to printk */

	/* If we register an early console, allow CPU 0 to printk */

	cpu_set(smp_processor_id(), cpu_online_map);

	set_cpu_online(smp_processor_id(), true);

#endif

#endif

}

}