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

Commit 29c0177e authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: change cpumask_scnprintf, cpumask_parse_user, cpulist_parse, and... 


cpumask: change cpumask_scnprintf, cpumask_parse_user, cpulist_parse, and cpulist_scnprintf to take pointers.

Impact: change calling convention of existing cpumask APIs

Most cpumask functions started with cpus_: these have been replaced by
cpumask_ ones which take struct cpumask pointers as expected.

These four functions don't have good replacement names; fortunately
they're rarely used, so we just change them over.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: paulus@samba.org
Cc: mingo@redhat.com
Cc: tony.luck@intel.com
Cc: ralf@linux-mips.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: cl@linux-foundation.org
Cc: srostedt@redhat.com
parent 98a79d6a

arch/ia64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static ssize_t show_shared_cpu_map(struct cache_info *this_leaf, char *buf) 
	cpumask_t shared_cpu_map;



	cpus_and(shared_cpu_map, this_leaf->shared_cpu_map, cpu_online_map);

	len = cpumask_scnprintf(buf, NR_CPUS+1, shared_cpu_map);

	len = cpumask_scnprintf(buf, NR_CPUS+1, &shared_cpu_map);

	len += sprintf(buf+len, "\n");

	return len;

}

arch/mips/kernel/smp-cmp.c

+2 −2
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ static int __init allowcpus(char *str) 
	int len;



	cpus_clear(cpu_allow_map);

	if (cpulist_parse(str, cpu_allow_map) == 0) {

	if (cpulist_parse(str, &cpu_allow_map) == 0) {

		cpu_set(0, cpu_allow_map);

		cpus_and(cpu_possible_map, cpu_possible_map, cpu_allow_map);

		len = cpulist_scnprintf(buf, sizeof(buf)-1, cpu_possible_map);

		len = cpulist_scnprintf(buf, sizeof(buf)-1, &cpu_possible_map);

		buf[len] = '\0';

		pr_debug("Allowable CPUs: %s\n", buf);

		return 1;

arch/powerpc/platforms/pseries/xics.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask) 
	irq_server = get_irq_server(virq, 1);

	if (irq_server == -1) {

		char cpulist[128];

		cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);

		cpumask_scnprintf(cpulist, sizeof(cpulist), &cpumask);

		printk(KERN_WARNING

			"%s: No online cpus in the mask %s for irq %d\n",

			__func__, cpulist, virq);

arch/x86/kernel/cpu/intel_cacheinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static ssize_t show_shared_cpu_map_func(struct _cpuid4_info *this_leaf, 
		cpumask_t *mask = &this_leaf->shared_cpu_map;



		n = type?

			cpulist_scnprintf(buf, len-2, *mask):

			cpumask_scnprintf(buf, len-2, *mask);

			cpulist_scnprintf(buf, len-2, mask) :

			cpumask_scnprintf(buf, len-2, mask);

		buf[n++] = '\n';

		buf[n] = '\0';

	}

arch/x86/kernel/setup_percpu.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static void __cpuinit numa_set_cpumask(int cpu, int enable) 
	else

		cpu_clear(cpu, *mask);



	cpulist_scnprintf(buf, sizeof(buf), *mask);

	cpulist_scnprintf(buf, sizeof(buf), mask);

	printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",

		enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf);

 }