From patchwork Thu Jan 28 00:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12051341 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=-12.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 B148CC433DB for ; Thu, 28 Jan 2021 00:53:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E84B64DCC for ; Thu, 28 Jan 2021 00:53:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E84B64DCC 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-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=fj+e+9R5B2iq3NkIWBhuTQmiiCUfb5kiu3JyNwQIcoY=; b=ew4D2Ae1jtcjv2j+Hd5zHqoGl1 RCIQWoi1d5X2VrZhPXGsR4KIkssqLuyms6Pg0LUzZDWrmaE2RQg53dATXjcjvLiC1jkjDCotf/vs/ M3+0X6Gj2HhRDCo+SWJs3GuCNhJT8WUvIZC15Vtlfd7kbFaeN0fTojGHKqzgjNT17tqvryakmuaCx JUeIxiYojVTR7Zb5CW0XoyzuoxcZZp14Gq/fPDXerbtiLDoyePKc0EFh8b2ZqCj6Jb1jXz0f2TQM5 FYLZ6GlRBIpYPXyDwxHTJStqaImftiRPP2NaVd4BTKRJeEGgbpSmdzeoh2/brOprRIpFD6dT3SWw+ ZgpSAyMQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4vY4-0007dY-Gk; Thu, 28 Jan 2021 00:52:36 +0000 Received: from conuserg-12.nifty.com ([210.131.2.79]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4vXl-0007Yd-Um; Thu, 28 Jan 2021 00:52:22 +0000 Received: from oscar.flets-west.jp (softbank126026094251.bbtec.net [126.26.94.251]) (authenticated) by conuserg-12.nifty.com with ESMTP id 10S0pjIV024172; Thu, 28 Jan 2021 09:51:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 10S0pjIV024172 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1611795106; bh=jQK2la2Ui/cbd7OVnHnnldJT4VCvoMGBdUZ9L0a9brw=; h=From:To:Cc:Subject:Date:From; b=RCDhaLrSacWGW2jMoA/CnF0PXcaoEGBb/27Iq340URIjyF5oOdKIioy3xHP3gsabi mw2ZoaQYGVOEzsCJagmyEeYa+/en2HXL/VNwpblpu+H4HmQiy3FuHey7xwIHawrWhz J046GTpD7glj5cXJqXMwWZMnKHaOG7PR+D6EQTv69ORhiD33OFaqqBEEw0u6JdDmdu GOthXjVErdPRXsvNFscEIJJkwb+kD+1TCC1UM6286+BXL8saw9gPf83J7mGkOtYG0m pEFy1183wEobPYroWAor8uPgimvicQp7OOAgunUeDJfA8jTaVxyFcGYh5N2AWxcL+E 4y0JIaJgjdFmg== X-Nifty-SrcIP: [126.26.94.251] From: Masahiro Yamada To: linux-arch@vger.kernel.org, x86@kernel.org Subject: [PATCH 00/27] arch: syscalls: unifiy all syscalltbl.sh into scripts/syscalltbl.sh Date: Thu, 28 Jan 2021 09:50:42 +0900 Message-Id: <20210128005110.2613902-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210127_195218_766469_B9AD9502 X-CRM114-Status: GOOD ( 13.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-xtensa@linux-xtensa.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-sh@vger.kernel.org, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As of v5.11-rc1, 12 architectures duplicate similar shell scripts: $ find arch -name syscalltbl.sh | sort arch/alpha/kernel/syscalls/syscalltbl.sh arch/arm/tools/syscalltbl.sh arch/ia64/kernel/syscalls/syscalltbl.sh arch/m68k/kernel/syscalls/syscalltbl.sh arch/microblaze/kernel/syscalls/syscalltbl.sh arch/mips/kernel/syscalls/syscalltbl.sh arch/parisc/kernel/syscalls/syscalltbl.sh arch/powerpc/kernel/syscalls/syscalltbl.sh arch/sh/kernel/syscalls/syscalltbl.sh arch/sparc/kernel/syscalls/syscalltbl.sh arch/x86/entry/syscalls/syscalltbl.sh arch/xtensa/kernel/syscalls/syscalltbl.sh This patch set unifies all of them into a single file, scripts/syscalltbl.sh. The code-diff is attractive: 51 files changed, 254 insertions(+), 674 deletions(-) delete mode 100644 arch/alpha/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/arm/tools/syscalltbl.sh delete mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/powerpc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/x86/entry/syscalls/syscalltbl.sh delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh create mode 100644 scripts/syscalltbl.sh Also, this includes Makefile fixes, and some x86 fixes and cleanups. My question is, how to merge this series. I am touching all architectures, but the first patch is a prerequisite of the rest of this series. One possibility is to ask the x86 maintainers to pickup the first 5 patches for v5.12-rc1, and then send the rest for v5.13-rc1, splitting per-arch. I want the x86 maintainers to check the first 5 patches because I cleaned up the x32 code. I know x32 was considered for deprecation, but my motivation is to clean-up scripts across the tree without changing the functionality. Masahiro Yamada (27): scripts: add generic syscalltbl.sh x86/syscalls: fix -Wmissing-prototypes warnings from COND_SYSCALL() x86/build: add missing FORCE and fix 'targets' to make if_changed work x86/entry/x32: rename __x32_compat_sys_* to __x64_compat_sys_* x86/syscalls: switch to generic syscalltbl.sh ARM: syscalls: switch to generic syscalltbl.sh alpha: add missing FORCE and fix 'targets' to make if_changed work alpha: syscalls: switch to generic syscalltbl.sh ia64: add missing FORCE and fix 'targets' to make if_changed work ia64: syscalls: switch to generic syscalltbl.sh m68k: add missing FORCE and fix 'targets' to make if_changed work m68k: syscalls: switch to generic syscalltbl.sh microblaze: add missing FORCE and fix 'targets' to make if_changed work microblaze: syscalls: switch to generic syscalltbl.sh mips: add missing FORCE and fix 'targets' to make if_changed work mips: syscalls: switch to generic syscalltbl.sh parisc: add missing FORCE and fix 'targets' to make if_changed work parisc: syscalls: switch to generic syscalltbl.sh sh: add missing FORCE and fix 'targets' to make if_changed work sh: syscalls: switch to generic syscalltbl.sh sparc: remove wrong comment from arch/sparc/include/asm/Kbuild sparc: add missing FORCE and fix 'targets' to make if_changed work sparc: syscalls: switch to generic syscalltbl.sh powerpc: add missing FORCE and fix 'targets' to make if_changed work powerpc: syscalls: switch to generic syscalltbl.sh xtensa: add missing FORCE and fix 'targets' to make if_changed work xtensa: syscalls: switch to generic syscalltbl.sh arch/alpha/kernel/syscalls/Makefile | 18 +++---- arch/alpha/kernel/syscalls/syscalltbl.sh | 32 ----------- arch/alpha/kernel/systbls.S | 3 +- arch/arm/kernel/entry-common.S | 8 +-- arch/arm/tools/Makefile | 9 ++-- arch/arm/tools/syscalltbl.sh | 22 -------- arch/ia64/kernel/entry.S | 3 +- arch/ia64/kernel/syscalls/Makefile | 19 +++---- arch/ia64/kernel/syscalls/syscalltbl.sh | 32 ----------- arch/m68k/kernel/syscalls/Makefile | 18 +++---- arch/m68k/kernel/syscalls/syscalltbl.sh | 32 ----------- arch/m68k/kernel/syscalltable.S | 3 +- arch/microblaze/kernel/syscall_table.S | 3 +- arch/microblaze/kernel/syscalls/Makefile | 18 +++---- arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ----------- arch/mips/include/asm/Kbuild | 7 ++- arch/mips/kernel/scall32-o32.S | 4 +- arch/mips/kernel/scall64-n32.S | 3 +- arch/mips/kernel/scall64-n64.S | 3 +- arch/mips/kernel/scall64-o32.S | 4 +- arch/mips/kernel/syscalls/Makefile | 53 ++++++++----------- arch/mips/kernel/syscalls/syscalltbl.sh | 36 ------------- arch/parisc/include/asm/Kbuild | 1 - arch/parisc/kernel/syscall.S | 16 +++--- arch/parisc/kernel/syscalls/Makefile | 34 +++++------- arch/parisc/kernel/syscalls/syscalltbl.sh | 36 ------------- arch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/kernel/syscalls/Makefile | 39 +++++--------- arch/powerpc/kernel/syscalls/syscalltbl.sh | 36 ------------- arch/powerpc/kernel/systbl.S | 5 +- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/sh/kernel/syscalls/Makefile | 18 +++---- arch/sh/kernel/syscalls/syscalltbl.sh | 32 ----------- arch/sparc/include/asm/Kbuild | 3 -- arch/sparc/kernel/syscalls/Makefile | 34 +++++------- arch/sparc/kernel/syscalls/syscalltbl.sh | 36 ------------- arch/sparc/kernel/systbls_32.S | 4 +- arch/sparc/kernel/systbls_64.S | 8 +-- arch/x86/entry/syscall_32.c | 12 +++-- arch/x86/entry/syscall_64.c | 9 ++-- arch/x86/entry/syscall_x32.c | 27 ++-------- arch/x86/entry/syscalls/Makefile | 33 +++++++----- arch/x86/entry/syscalls/syscalltbl.sh | 46 ---------------- arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/syscall_wrapper.h | 11 ++-- arch/x86/um/sys_call_table_32.c | 8 +-- arch/x86/um/sys_call_table_64.c | 9 ++-- arch/xtensa/kernel/syscall.c | 3 +- arch/xtensa/kernel/syscalls/Makefile | 18 +++---- arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ----------- scripts/syscalltbl.sh | 52 ++++++++++++++++++ 51 files changed, 254 insertions(+), 674 deletions(-) delete mode 100644 arch/alpha/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/arm/tools/syscalltbl.sh delete mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/powerpc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/x86/entry/syscalls/syscalltbl.sh delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh create mode 100644 scripts/syscalltbl.sh