From c64a67a9288a947074ea0deb4862dbbaad110588 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 9 Apr 2021 11:51:49 +0200 Subject: [PATCH] 5.4-stable patches added patches: init-kconfig-make-compile_test-depend-on-has_iomem.patch init-kconfig-make-compile_test-depend-on-s390.patch --- ...ake-compile_test-depend-on-has_iomem.patch | 60 +++++++++++++++++++ ...fig-make-compile_test-depend-on-s390.patch | 39 ++++++++++++ queue-5.4/series | 2 + 3 files changed, 101 insertions(+) create mode 100644 queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch create mode 100644 queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch diff --git a/queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch b/queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch new file mode 100644 index 00000000000..be3a40b46cd --- /dev/null +++ b/queue-5.4/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 +Date: Fri, 12 Mar 2021 21:07:08 -0800 +Subject: init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM + +From: Masahiro Yamada + +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 +Cc: Heiko Carstens +Cc: Guenter Roeck +Cc: Arnd Bergmann +Cc: Kees Cook +Cc: Daniel Borkmann +Cc: Johannes Weiner +Cc: KP Singh +Cc: Nathan Chancellor +Cc: Nick Terrell +Cc: Quentin Perret +Cc: Valentin Schneider +Cc: "Enrico Weigelt, metux IT consult" +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +--- + init/Kconfig | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -76,8 +76,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.4/init-kconfig-make-compile_test-depend-on-s390.patch b/queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch new file mode 100644 index 00000000000..c2951cd7c98 --- /dev/null +++ b/queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch @@ -0,0 +1,39 @@ +From 334ef6ed06fa1a54e35296b77b693bcf6d63ee9e Mon Sep 17 00:00:00 2001 +From: Heiko Carstens +Date: Wed, 18 Nov 2020 21:32:33 +0100 +Subject: init/Kconfig: make COMPILE_TEST depend on !S390 + +From: Heiko Carstens + +commit 334ef6ed06fa1a54e35296b77b693bcf6d63ee9e upstream. + +While allmodconfig and allyesconfig build for s390 there are also +various bots running compile tests with randconfig, where PCI is +disabled. This reveals that a lot of drivers should actually depend on +HAS_IOMEM. +Adding this to each device driver would be a never ending story, +therefore just disable COMPILE_TEST for s390. + +The reasoning is more or less the same as described in +commit bc083a64b6c0 ("init/Kconfig: make COMPILE_TEST depend on !UML"). + +Reported-by: kernel test robot +Suggested-by: Arnd Bergmann +Signed-off-by: Heiko Carstens +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +--- + init/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -76,7 +76,7 @@ config INIT_ENV_ARG_LIMIT + + config COMPILE_TEST + bool "Compile also drivers which will not load" +- depends on !UML ++ depends on !UML && !S390 + default n + help + Some drivers can be compiled on a different platform than they are diff --git a/queue-5.4/series b/queue-5.4/series index 05c5945c12b..9474ddefa65 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -19,3 +19,5 @@ cifs-silently-ignore-unknown-oplock-break-handle.patch bpf-x86-validate-computation-of-branch-displacements-for-x86-64.patch bpf-x86-validate-computation-of-branch-displacements-for-x86-32.patch nvme-mpath-replace-direct_make_request-with-generic_make_request.patch +init-kconfig-make-compile_test-depend-on-s390.patch +init-kconfig-make-compile_test-depend-on-has_iomem.patch -- 2.47.3