Commit 9af18e56 authored Aug 12, 2018 by Willem de Bruijn Committed by David S. Miller Aug 13, 2018

cpumask: make cpumask_next_wrap available without smp



The kbuild robot shows build failure on machines without CONFIG_SMP:

  drivers/net/virtio_net.c:1916:10: error:
    implicit declaration of function 'cpumask_next_wrap'

cpumask_next_wrap is exported from lib/cpumask.o, which has

    lib-$(CONFIG_SMP) += cpumask.o

same as other functions, also define it as static inline in the
NR_CPUS==1 branch in include/linux/cpumask.h.

If wrap is true and next == start, return nr_cpumask_bits, or 1.
Else wrap across the range of valid cpus, here [0].

Fixes: 2ca653d6 ("virtio_net: Stripe queue affinities across cores.")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7c53a722

include/linux/cpumask.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,13 @@ static inline unsigned int cpumask_next_and(int n,
		return n+1;
		}

		static inline unsigned int cpumask_next_wrap(int n, const struct cpumask *mask,
		int start, bool wrap)
		{
		/* cpu0 unless stop condition, wrap and at cpu0, then nr_cpumask_bits */
		return (wrap && n == 0);
		}

		/* cpu must be a valid cpu, ie 0, so there's no other choice. */
		static inline unsigned int cpumask_any_but(const struct cpumask *mask,
		unsigned int cpu)

Admin message