2023-07-21 14:07:46

by Masahiro Yamada

Subject: [PATCH] s390: use obj-y to descend into drivers/s390/

I like to use obj-y in as many places as possible.

Change the drivers-y to obj-y. It moves the objects from drivers/s390/
to slightly lower address, but fixes the single build issue. [1]

[1]: https://lore.kernel.org/linux-kbuild/[email protected]/T/#m27f781ab60acadfed8a9e9642f30d5414a5e2df3

Signed-off-by: Masahiro Yamada <[email protected]>
Tested-by: Jiri Slaby <[email protected]>
---

arch/s390/Makefile | 1 -
drivers/Makefile | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 5ed242897b0d..a53a36ee0731 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -119,7 +119,6 @@ export KBUILD_CFLAGS_DECOMPRESSOR
OBJCOPYFLAGS := -O binary

libs-y += arch/s390/lib/
-drivers-y += drivers/s390/

boot := arch/s390/boot
syscalls := arch/s390/kernel/syscalls
diff --git a/drivers/Makefile b/drivers/Makefile
index 7241d80a7b29..a7459e77df37 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -195,3 +195,5 @@ obj-$(CONFIG_PECI) += peci/
obj-$(CONFIG_HTE) += hte/
obj-$(CONFIG_DRM_ACCEL) += accel/
obj-$(CONFIG_CDX_BUS) += cdx/
+
+obj-$(CONFIG_S390) += s390/
--
2.39.2

2023-07-21 14:52:47

by Christian Borntraeger

Subject: Re: [PATCH] s390: use obj-y to descend into drivers/s390/

Am 21.07.23 um 15:41 schrieb Masahiro Yamada:
> I like to use obj-y in as many places as possible.

Please do not use "I like". That is just too polite.

This fixes a bug as outlined below and maybe make it a clear statement that the current use is
non-standard and needs to be fixed - I think.
>
> Change the drivers-y to obj-y. It moves the objects from drivers/s390/
> to slightly lower address, but fixes the single build issue. [1]
>
> [1]: https://lore.kernel.org/linux-kbuild/[email protected]/T/#m27f781ab60acadfed8a9e9642f30d5414a5e2df3
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> Tested-by: Jiri Slaby <[email protected]>
> ---
>
> arch/s390/Makefile | 1 -
> drivers/Makefile | 2 ++
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/s390/Makefile b/arch/s390/Makefile
> index 5ed242897b0d..a53a36ee0731 100644
> --- a/arch/s390/Makefile
> +++ b/arch/s390/Makefile
> @@ -119,7 +119,6 @@ export KBUILD_CFLAGS_DECOMPRESSOR
> OBJCOPYFLAGS := -O binary
>
> libs-y += arch/s390/lib/
> -drivers-y += drivers/s390/
>
> boot := arch/s390/boot
> syscalls := arch/s390/kernel/syscalls
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 7241d80a7b29..a7459e77df37 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -195,3 +195,5 @@ obj-$(CONFIG_PECI) += peci/
> obj-$(CONFIG_HTE) += hte/
> obj-$(CONFIG_DRM_ACCEL) += accel/
> obj-$(CONFIG_CDX_BUS) += cdx/
> +
> +obj-$(CONFIG_S390) += s390/