Commit 6496edfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull final removal of deprecated cpus_* cpumask functions from Rusty Russell:
 "This is the final removal (after several years!) of the obsolete
  cpus_* functions, prompted by their mis-use in staging.

  With these function removed, all cpu functions should only iterate to
  nr_cpu_ids, so we finally only allocate that many bits when cpumasks
  are allocated offstack"

* tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
  cpumask: remove __first_cpu / __next_cpu
  cpumask: resurrect CPU_MASK_CPU0
  linux/cpumask.h: add typechecking to cpumask_test_cpu
  cpumask: only allocate nr_cpumask_bits.
  Fix weird uses of num_online_cpus().
  cpumask: remove deprecated functions.
  mips: fix obsolete cpumask_of_cpu usage.
  x86: fix more deprecated cpu function usage.
  ia64: remove deprecated cpus_ usage.
  powerpc: fix deprecated CPU_MASK_CPU0 usage.
  CPU_MASK_ALL/CPU_MASK_NONE: remove from deprecated region.
  staging/lustre/o2iblnd: Don't use cpus_weight
  staging/lustre/libcfs: replace deprecated cpus_ calls with cpumask_
  staging/lustre/ptlrpc: Do not use deprecated cpus_* functions
  blackfin: fix up obsolete cpu function usage.
  parisc: fix up obsolete cpu function usage.
  tile: fix up obsolete cpu function usage.
  arm64: fix up obsolete cpu function usage.
  mips: fix up obsolete cpu function usage.
  x86: fix up obsolete cpu function usage.
  ...
parents b19a42e3 e4afa120

Documentation/cpu-hotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ Never use anything other than cpumask_t to represent bitmap of CPUs. 
	for_each_possible_cpu     - Iterate over cpu_possible_mask

	for_each_online_cpu       - Iterate over cpu_online_mask

	for_each_present_cpu      - Iterate over cpu_present_mask

	for_each_cpu_mask(x,mask) - Iterate over some random collection of cpu mask.

	for_each_cpu(x,mask)      - Iterate over some random collection of cpu mask.



	#include <linux/cpu.h>

	get_online_cpus() and put_online_cpus():

arch/arm64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ void smp_send_stop(void) 
		cpumask_t mask;



		cpumask_copy(&mask, cpu_online_mask);

		cpu_clear(smp_processor_id(), mask);

		cpumask_clear_cpu(smp_processor_id(), &mask);



		smp_cross_call(&mask, IPI_CPU_STOP);

	}

arch/blackfin/mach-bf561/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void platform_send_ipi(cpumask_t callmap, int irq) 
	unsigned int cpu;

	int offset = (irq == IRQ_SUPPLE_0) ? 6 : 8;



	for_each_cpu_mask(cpu, callmap) {

	for_each_cpu(cpu, &callmap) {

		BUG_ON(cpu >= 2);

		SSYNC();

		bfin_write_SICB_SYSCR(bfin_read_SICB_SYSCR() | (1 << (offset + cpu)));

arch/ia64/include/asm/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) 
#ifdef CONFIG_ACPI_NUMA

extern cpumask_t early_cpu_possible_map;

#define for_each_possible_early_cpu(cpu)  \

	for_each_cpu_mask((cpu), early_cpu_possible_map)

	for_each_cpu((cpu), &early_cpu_possible_map)



static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus)

{
@@ -125,13 +125,13 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus) 
	int cpu;

	int next_nid = 0;



	low_cpu = cpus_weight(early_cpu_possible_map);

	low_cpu = cpumask_weight(&early_cpu_possible_map);



	high_cpu = max(low_cpu, min_cpus);

	high_cpu = min(high_cpu + reserve_cpus, NR_CPUS);



	for (cpu = low_cpu; cpu < high_cpu; cpu++) {

		cpu_set(cpu, early_cpu_possible_map);

		cpumask_set_cpu(cpu, &early_cpu_possible_map);

		if (node_cpuid[cpu].nid == NUMA_NO_NODE) {

			node_cpuid[cpu].nid = next_nid;

			next_nid++;

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) 
	    (pa->apic_id << 8) | (pa->local_sapic_eid);

	/* nid should be overridden as logical node id later */

	node_cpuid[srat_num_cpus].nid = pxm;

	cpu_set(srat_num_cpus, early_cpu_possible_map);

	cpumask_set_cpu(srat_num_cpus, &early_cpu_possible_map);

	srat_num_cpus++;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE