* [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE
@ 2020-04-13 1:31 Masahiro Yamada
2020-04-30 10:22 ` Vasily Gorbik
0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2020-04-13 1:31 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-s390
Cc: Masahiro Yamada, Gerald Schaefer, Martin Schwidefsky, Nayna Jain,
Oleg Nesterov, Philipp Rudo, linux-kernel
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 <masahiroy@kernel.org>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE
2020-04-13 1:31 [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE Masahiro Yamada
@ 2020-04-30 10:22 ` Vasily Gorbik
0 siblings, 0 replies; 2+ messages in thread
From: Vasily Gorbik @ 2020-04-30 10:22 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Heiko Carstens, Christian Borntraeger, linux-s390,
Gerald Schaefer, Martin Schwidefsky, Nayna Jain, Oleg Nesterov,
Philipp Rudo, linux-kernel
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 <masahiroy@kernel.org>
> ---
>
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-30 10:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-13 1:31 [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE Masahiro Yamada
2020-04-30 10:22 ` Vasily Gorbik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).