2020-04-13 05:44:07

by Masahiro Yamada

Subject: [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE

s390 uses the UTS_MACHINE defined arch/s390/Makefile as follows:

UTS_MACHINE := s390x

We do not need to pass the fixed string from the command line.
Hard-code user_regset_view::name, like many other architectures do.

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

arch/s390/kernel/Makefile | 5 -----
arch/s390/kernel/ptrace.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 75f26d775027..a8f136943deb 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -33,11 +33,6 @@ CFLAGS_stacktrace.o += -fno-optimize-sibling-calls
CFLAGS_dumpstack.o += -fno-optimize-sibling-calls
CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls

-#
-# Pass UTS_MACHINE for user_regset definition
-#
-CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
-
obj-y := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o
obj-y += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 58faa12542a1..994a8b86edae 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -1416,7 +1416,7 @@ static const struct user_regset s390_regsets[] = {
};

static const struct user_regset_view user_s390_view = {
- .name = UTS_MACHINE,
+ .name = "s390x",
.e_machine = EM_S390,
.regsets = s390_regsets,
.n = ARRAY_SIZE(s390_regsets)
--
2.25.1

2020-04-30 10:26:48

by Vasily Gorbik

Subject: Re: [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE

On Mon, Apr 13, 2020 at 10:31:13AM +0900, Masahiro Yamada wrote:
> s390 uses the UTS_MACHINE defined arch/s390/Makefile as follows:
>
> UTS_MACHINE := s390x
>
> We do not need to pass the fixed string from the command line.
> Hard-code user_regset_view::name, like many other architectures do.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/s390/kernel/Makefile | 5 -----
> arch/s390/kernel/ptrace.c | 2 +-
> 2 files changed, 1 insertion(+), 6 deletions(-)

Yes, since we don't have 31-bit kernel build support for s390 anymore
this makes sense.
Applied, thanks.