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

Commit a2094502 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Make mdesc_fill_in_cpu_data take a cpumask_t pointer. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 890db403

arch/sparc/include/asm/mdesc.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct mdesc_notifier_client { 


extern void mdesc_register_notifier(struct mdesc_notifier_client *client);



extern void mdesc_fill_in_cpu_data(cpumask_t mask);

extern void mdesc_fill_in_cpu_data(cpumask_t *mask);

extern void mdesc_populate_present_mask(cpumask_t *mask);



extern void sun4v_mdesc_init(void);

arch/sparc/kernel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp, 
			     resp_len, ncpus, mask,

			     DR_CPU_STAT_CONFIGURED);



	mdesc_fill_in_cpu_data(*mask);

	mdesc_fill_in_cpu_data(mask);



	for_each_cpu_mask(cpu, *mask) {

		int err;

arch/sparc/kernel/mdesc.c

+3 −3
Original line number Diff line number Diff line
@@ -857,12 +857,12 @@ static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpu 
	return NULL;

}



void __cpuinit mdesc_fill_in_cpu_data(cpumask_t mask)

void __cpuinit mdesc_fill_in_cpu_data(cpumask_t *mask)

{

	struct mdesc_handle *hp;



	mdesc_populate_present_mask(&mask);

	mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, &mask);

	mdesc_populate_present_mask(mask);

	mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask);



#ifdef CONFIG_SMP

	sparc64_multi_core = 1;

arch/sparc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ void __init paging_init(void) 


	if (tlb_type == hypervisor) {

		sun4v_mdesc_init();

		mdesc_fill_in_cpu_data(CPU_MASK_ALL);

		mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);

	}



	/* Once the OF device tree and MDESC have been setup, we know