From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Apr 2021 09:52:20 +0000 (+0200)
Subject: 5.11-stable patches
X-Git-Tag: v4.4.266~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe1041b1fb6ba056305b2f0030a38eb6c0617607;p=thirdparty%2Fkernel%2Fstable-queue.git

5.11-stable patches

added patches:
	init-kconfig-make-compile_test-depend-on-has_iomem.patch
---

diff --git a/queue-5.11/init-kconfig-make-compile_test-depend-on-has_iomem.patch b/queue-5.11/init-kconfig-make-compile_test-depend-on-has_iomem.patch
new file mode 100644
index 00000000000..1aa39e65f3b
--- /dev/null
+++ b/queue-5.11/init-kconfig-make-compile_test-depend-on-has_iomem.patch
@@ -0,0 +1,60 @@
+From ea29b20a828511de3348334e529a3d046a180416 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Fri, 12 Mar 2021 21:07:08 -0800
+Subject: init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit ea29b20a828511de3348334e529a3d046a180416 upstream.
+
+I read the commit log of the following two:
+
+- bc083a64b6c0 ("init/Kconfig: make COMPILE_TEST depend on !UML")
+- 334ef6ed06fa ("init/Kconfig: make COMPILE_TEST depend on !S390")
+
+Both are talking about HAS_IOMEM dependency missing in many drivers.
+
+So, 'depends on HAS_IOMEM' seems the direct, sensible solution to me.
+
+This does not change the behavior of UML. UML still cannot enable
+COMPILE_TEST because it does not provide HAS_IOMEM.
+
+The current dependency for S390 is too strong. Under the condition of
+CONFIG_PCI=y, S390 provides HAS_IOMEM, hence can enable COMPILE_TEST.
+
+I also removed the meaningless 'default n'.
+
+Link: https://lkml.kernel.org/r/20210224140809.1067582-1-masahiroy@kernel.org
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Cc: Heiko Carstens <hca@linux.ibm.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Arnd Bergmann <arnd@kernel.org>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: Johannes Weiner <hannes@cmpxchg.org>
+Cc: KP Singh <kpsingh@google.com>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Cc: Nick Terrell <terrelln@fb.com>
+Cc: Quentin Perret <qperret@google.com>
+Cc: Valentin Schneider <valentin.schneider@arm.com>
+Cc: "Enrico Weigelt, metux IT consult" <lkml@metux.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ init/Kconfig |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -113,8 +113,7 @@ config INIT_ENV_ARG_LIMIT
+ 
+ config COMPILE_TEST
+ 	bool "Compile also drivers which will not load"
+-	depends on !UML && !S390
+-	default n
++	depends on HAS_IOMEM
+ 	help
+ 	  Some drivers can be compiled on a different platform than they are
+ 	  intended to be run on. Despite they cannot be loaded there (or even
diff --git a/queue-5.11/series b/queue-5.11/series
index d8b8a8d901b..796cd11db1b 100644
--- a/queue-5.11/series
+++ b/queue-5.11/series
@@ -42,3 +42,4 @@ kbuild-do-not-clean-resolve_btfids-if-the-output-doe.patch
 tools-resolve_btfids-add-libbpf-to-.gitignore.patch
 bpf-x86-validate-computation-of-branch-displacements-for-x86-64.patch
 bpf-x86-validate-computation-of-branch-displacements-for-x86-32.patch
+init-kconfig-make-compile_test-depend-on-has_iomem.patch