From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 27 May 2020 08:09:31 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.225~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a74be862b3e2a308a37df291edf880831a3aa779;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	cpumask-make-for_each_cpu_wrap-available-on-up-as-well.patch
---

diff --git a/queue-4.4/cpumask-make-for_each_cpu_wrap-available-on-up-as-well.patch b/queue-4.4/cpumask-make-for_each_cpu_wrap-available-on-up-as-well.patch
new file mode 100644
index 00000000000..b5f31a99d0a
--- /dev/null
+++ b/queue-4.4/cpumask-make-for_each_cpu_wrap-available-on-up-as-well.patch
@@ -0,0 +1,43 @@
+From d207af2eab3f8668b95ad02b21930481c42806fd Mon Sep 17 00:00:00 2001
+From: Michael Kelley <mhkelley@outlook.com>
+Date: Wed, 14 Feb 2018 02:54:03 +0000
+Subject: cpumask: Make for_each_cpu_wrap() available on UP as well
+
+From: Michael Kelley <mhkelley@outlook.com>
+
+commit d207af2eab3f8668b95ad02b21930481c42806fd upstream.
+
+for_each_cpu_wrap() was originally added in the #else half of a
+large "#if NR_CPUS == 1" statement, but was omitted in the #if
+half.  This patch adds the missing #if half to prevent compile
+errors when NR_CPUS is 1.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Michael Kelley <mhkelley@outlook.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: kys@microsoft.com
+Cc: martin.petersen@oracle.com
+Cc: mikelley@microsoft.com
+Fixes: c743f0a5c50f ("sched/fair, cpumask: Export for_each_cpu_wrap()")
+Link: http://lkml.kernel.org/r/SN6PR1901MB2045F087F59450507D4FCC17CBF50@SN6PR1901MB2045.namprd19.prod.outlook.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/cpumask.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/include/linux/cpumask.h
++++ b/include/linux/cpumask.h
+@@ -160,6 +160,8 @@ static inline unsigned int cpumask_local
+ 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
+ #define for_each_cpu_not(cpu, mask)		\
+ 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
++#define for_each_cpu_wrap(cpu, mask, start)	\
++	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)(start))
+ #define for_each_cpu_and(cpu, mask, and)	\
+ 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)and)
+ #else
diff --git a/queue-4.4/series b/queue-4.4/series
index e95e99b47b2..d52a5b1cf36 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -63,3 +63,4 @@ staging-iio-ad2s1210-fix-spi-reading.patch
 mei-release-me_cl-object-reference.patch
 iio-sca3000-remove-an-erroneous-get_device.patch
 l2tp-device-mtu-setup-tunnel-socket-needs-a-lock.patch
+cpumask-make-for_each_cpu_wrap-available-on-up-as-well.patch