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

Commit 828a6986 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc/cpumask: Update some comments 



Since the *_map cpumask variants are deprecated, change the comments to
instead refer to *_mask.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 25863de0

arch/powerpc/kernel/setup-common.c

+3 −3
Original line number Diff line number Diff line
@@ -394,14 +394,14 @@ static void __init cpu_init_thread_core_maps(int tpc) 


/**

 * setup_cpu_maps - initialize the following cpu maps:

 *                  cpu_possible_map

 *                  cpu_present_map

 *                  cpu_possible_mask

 *                  cpu_present_mask

 *

 * Having the possible map set up early allows us to restrict allocations

 * of things like irqstacks to num_possible_cpus() rather than NR_CPUS.

 *

 * We do not initialize the online map here; cpus set their own bits in

 * cpu_online_map as they come up.

 * cpu_online_mask as they come up.

 *

 * This function is valid only for Open Firmware systems.  finish_device_tree

 * must be called before using this.

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ out: 
	return id;

}



/* Must be called when no change can occur to cpu_present_map,

/* Must be called when no change can occur to cpu_present_mask,

 * i.e. during cpu online or offline.

 */

static struct device_node *cpu_to_l2cache(int cpu)

arch/powerpc/platforms/powermac/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void __init pmac_init_early(void) 
#endif



	/* SMP Init has to be done early as we need to patch up

	 * cpu_possible_map before interrupt stacks are allocated

	 * cpu_possible_mask before interrupt stacks are allocated

	 * or kaboom...

	 */

#ifdef CONFIG_SMP

arch/powerpc/platforms/powermac/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int __init smp_psurge_probe(void) 
	/* This is necessary because OF doesn't know about the

	 * secondary cpu(s), and thus there aren't nodes in the

	 * device tree for them, and smp_setup_cpu_maps hasn't

	 * set their bits in cpu_present_map.

	 * set their bits in cpu_present_mask.

	 */

	if (ncpus > NR_CPUS)

		ncpus = NR_CPUS;
@@ -944,7 +944,7 @@ void __init pmac_setup_smp(void) 
	}

#ifdef CONFIG_PPC32

	else {

		/* We have to set bits in cpu_possible_map here since the

		/* We have to set bits in cpu_possible_mask here since the

		 * secondary CPU(s) aren't in the device tree. Various

		 * things won't be initialized for CPUs not in the possible

		 * map, so we really need to fix it up here.

arch/powerpc/platforms/pseries/hotplug-cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void pseries_cpu_die(unsigned int cpu) 
}



/*

 * Update cpu_present_map and paca(s) for a new cpu node.  The wrinkle

 * Update cpu_present_mask and paca(s) for a new cpu node.  The wrinkle

 * here is that a cpu device node may represent up to two logical cpus

 * in the SMT case.  We must honor the assumption in other code that

 * the logical ids for sibling SMT threads x and y are adjacent, such
@@ -270,7 +270,7 @@ static int pseries_add_processor(struct device_node *np) 
			cpumask_shift_left(tmp, tmp, nthreads);



	if (cpumask_empty(tmp)) {

		printk(KERN_ERR "Unable to find space in cpu_present_map for"

		printk(KERN_ERR "Unable to find space in cpu_present_mask for"

		       " processor %s with %d thread(s)\n", np->name,

		       nthreads);

		goto out_unlock;