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

Commit e4afa120 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: remove __first_cpu / __next_cpu 



They were for use by the deprecated first_cpu() and next_cpu() wrappers,
but sparc used them directly.

They're now replaced by cpumask_first / cpumask_next.  And __next_cpu_nr
is completely obsolete.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1527781d

arch/sparc/kernel/time_32.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static __init int setup_timer_cs(void) 
static void percpu_ce_setup(enum clock_event_mode mode,

			struct clock_event_device *evt)

{

	int cpu = __first_cpu(evt->cpumask);

	int cpu = cpumask_first(evt->cpumask);



	switch (mode) {

		case CLOCK_EVT_MODE_PERIODIC:
@@ -218,7 +218,7 @@ static void percpu_ce_setup(enum clock_event_mode mode, 
static int percpu_ce_set_next_event(unsigned long delta,

				    struct clock_event_device *evt)

{

	int cpu = __first_cpu(evt->cpumask);

	int cpu = cpumask_first(evt->cpumask);

	unsigned int next = (unsigned int)delta;



	sparc_config.load_profile_irq(cpu, next);

lib/cpumask.c

+0 −21
Original line number Diff line number Diff line
@@ -5,27 +5,6 @@ 
#include <linux/export.h>

#include <linux/bootmem.h>



int __first_cpu(const cpumask_t *srcp)

{

	return min_t(int, NR_CPUS, find_first_bit(srcp->bits, NR_CPUS));

}

EXPORT_SYMBOL(__first_cpu);



int __next_cpu(int n, const cpumask_t *srcp)

{

	return min_t(int, NR_CPUS, find_next_bit(srcp->bits, NR_CPUS, n+1));

}

EXPORT_SYMBOL(__next_cpu);



#if NR_CPUS > 64

int __next_cpu_nr(int n, const cpumask_t *srcp)

{

	return min_t(int, nr_cpu_ids,

				find_next_bit(srcp->bits, nr_cpu_ids, n+1));

}

EXPORT_SYMBOL(__next_cpu_nr);

#endif



/**

 * cpumask_next_and - get the next cpu in *src1p & *src2p

 * @n: the cpu prior to the place to search (ie. return will be > @n)