Commit 14c38413 authored by Yury Norov's avatar Yury Norov
Browse files

cpumask: drop cpumask_next_wrap_old() 



Now that we have cpumask_next_wrap() wired to generic find_next_bit_wrap(),
the old implementation is not needed.

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent 7a610694

include/linux/cpumask.h

+0 −21
Original line number Diff line number Diff line
@@ -332,27 +332,6 @@ unsigned int cpumask_next_wrap(int n, const struct cpumask *src) 
#define for_each_cpu(cpu, mask)				\

	for_each_set_bit(cpu, cpumask_bits(mask), small_cpumask_bits)



#if NR_CPUS == 1

static __always_inline

unsigned int cpumask_next_wrap_old(int n, const struct cpumask *mask, int start, bool wrap)

{

	cpumask_check(start);

	if (n != -1)

		cpumask_check(n);



	/*

	 * Return the first available CPU when wrapping, or when starting before cpu0,

	 * since there is only one valid option.

	 */

	if (wrap && n >= 0)

		return nr_cpumask_bits;



	return cpumask_first(mask);

}

#else

unsigned int __pure cpumask_next_wrap_old(int n, const struct cpumask *mask, int start, bool wrap);

#endif



/**

 * for_each_cpu_wrap - iterate over every cpu in a mask, starting at a specified location

 * @cpu: the (optionally unsigned) integer iterator

lib/cpumask.c

+0 −32
Original line number Diff line number Diff line
@@ -7,38 +7,6 @@ 
#include <linux/memblock.h>

#include <linux/numa.h>



/**

 * cpumask_next_wrap_old - helper to implement for_each_cpu_wrap

 * @n: the cpu prior to the place to search

 * @mask: the cpumask pointer

 * @start: the start point of the iteration

 * @wrap: assume @n crossing @start terminates the iteration

 *

 * Return: >= nr_cpu_ids on completion

 *

 * Note: the @wrap argument is required for the start condition when

 * we cannot assume @start is set in @mask.

 */

unsigned int cpumask_next_wrap_old(int n, const struct cpumask *mask, int start, bool wrap)

{

	unsigned int next;



again:

	next = cpumask_next(n, mask);



	if (wrap && n < start && next >= start) {

		return nr_cpumask_bits;



	} else if (next >= nr_cpumask_bits) {

		wrap = true;

		n = -1;

		goto again;

	}



	return next;

}

EXPORT_SYMBOL(cpumask_next_wrap_old);



/* These are not inline because of header tangles. */

#ifdef CONFIG_CPUMASK_OFFSTACK

/**