From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CC10C2BB85 for ; Mon, 13 Apr 2020 01:32:01 +0000 (UTC) Received: from vger.kernel.org (unknown [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B93920678 for ; Mon, 13 Apr 2020 01:32:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="avtOUtVK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B93920678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726975AbgDMBbl (ORCPT ); Sun, 12 Apr 2020 21:31:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.18]:59414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726917AbgDMBbl (ORCPT ); Sun, 12 Apr 2020 21:31:41 -0400 Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A8CC0A3BE0 for ; Sun, 12 Apr 2020 18:31:41 -0700 (PDT) Received: from oscar.flets-west.jp (softbank060142179096.bbtec.net [60.142.179.96]) (authenticated) by conuserg-10.nifty.com with ESMTP id 03D1VGPU011829; Mon, 13 Apr 2020 10:31:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 03D1VGPU011829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1586741480; bh=e/AZEK440pcz6YJKP4Zb91ImUjAD3JIb/ifBlkwowP8=; h=From:To:Cc:Subject:Date:From; b=avtOUtVKvpGmoxMTC4HmCQC9aEymyl7Nc06cgsDEHdKvRhU0TkcCFNzB5ruX3h+hH JyJGhmeh4kIQhrHBCDvkMg3b0Q19LwMQjzTKd0koRGvPbNcVLqDGq6gVQ7BoH/v1Jf tbSofveBUGJmwOqH6w6VoM7g2oXPSDaA/PNN+OJd+WP3lLSsbfJgulu29YmsaY5NEQ YxLrnIBTFi3O8wa3j4A/fwTmaBXDci0dRA5FRaBzU7N9b0TOaSOt8XdR4xwqyV+VdO U4QSYHj27wu5VJjL25J8URIJitef0H1q+jPQIt+KmT2cyvT8hakrxltW6Ae3P8/l+2 rsk3xiN3AuZfw== X-Nifty-SrcIP: [60.142.179.96] From: Masahiro Yamada To: Heiko Carstens , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org Cc: Masahiro Yamada , Gerald Schaefer , Martin Schwidefsky , Nayna Jain , Oleg Nesterov , Philipp Rudo , linux-kernel@vger.kernel.org Subject: [PATCH] s390: ptrace: hard-code "s390x" instead of UTS_MACHINE Date: Mon, 13 Apr 2020 10:31:13 +0900 Message-Id: <20200413013113.8529-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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