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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 5328AC433E0 for ; Thu, 18 Jun 2020 11:03:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A796204EA for ; Thu, 18 Jun 2020 11:03:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729469AbgFRLDg (ORCPT ); Thu, 18 Jun 2020 07:03:36 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6283 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729389AbgFRLDd (ORCPT ); Thu, 18 Jun 2020 07:03:33 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id D835E7694E38895BBA77; Thu, 18 Jun 2020 19:03:29 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.174) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Thu, 18 Jun 2020 19:03:23 +0800 From: Xiaoming Ni To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , Subject: [PATCH] s390: fix build error for sys_call_table_emu Date: Thu, 18 Jun 2020 19:03:20 +0800 Message-ID: <20200618110320.104013-1-nixiaoming@huawei.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.189.174] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Build error on s390: arch/s390/kernel/entry.o: in function `sys_call_table_emu': >> (.rodata+0x1288): undefined reference to `__s390_' In commit ("All arch: remove system call sys_sysctl") 148 common fdatasync sys_fdatasync sys_fdatasync -149 common _sysctl sys_sysctl compat_sys_sysctl +149 common _sysctl sys_ni_syscall 150 common mlock sys_mlock sys_mlock After the patch is integrated, there is a format error in the generated arch/s390/include/generated/asm/syscall_table.h: SYSCALL(sys_fdatasync, sys_fdatasync) SYSCALL(sys_ni_syscall,) /* cause build error */ SYSCALL(sys_mlock,sys_mlock) There are holes in the system call number in arch/s390/kernel/syscalls/syscall.tbl. When generating syscall_table.h, these hole numbers will be automatically filled with "NI_SYSCALL". Therefore, delete the number 149 to fix the current compilation failure. Similarly, modify tools/perf/arch/s390/entry/syscalls/syscall.tbl. Fixes: ("All arch: remove system call sys_sysctl") Fixes: https://lore.kernel.org/linuxppc-dev/20200616030734.87257-1-nixiaoming@huawei.com/ Reported-by: kernel test robot Signed-off-by: Xiaoming Ni --- arch/s390/kernel/syscalls/syscall.tbl | 1 - tools/perf/arch/s390/entry/syscalls/syscall.tbl | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index f17aaf6fe5de..bcaf93994e3c 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -138,7 +138,6 @@ 146 common writev sys_writev compat_sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync -149 common _sysctl sys_ni_syscall 150 common mlock sys_mlock sys_mlock 151 common munlock sys_munlock sys_munlock 152 common mlockall sys_mlockall sys_mlockall diff --git a/tools/perf/arch/s390/entry/syscalls/syscall.tbl b/tools/perf/arch/s390/entry/syscalls/syscall.tbl index 0193f9b98753..eb77d0d01d8f 100644 --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl @@ -138,7 +138,6 @@ 146 common writev sys_writev compat_sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync -149 common _sysctl sys_ni_syscall 150 common mlock sys_mlock compat_sys_mlock 151 common munlock sys_munlock compat_sys_munlock 152 common mlockall sys_mlockall sys_mlockall -- 2.27.0