From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-f195.google.com ([209.85.214.195]:43823 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727524AbeIDJFh (ORCPT ); Tue, 4 Sep 2018 05:05:37 -0400 Received: by mail-pl1-f195.google.com with SMTP id x6-v6so1001866plv.10 for ; Mon, 03 Sep 2018 21:42:19 -0700 (PDT) From: Firoz Khan Subject: [PATCH 2/4] sparc: Replace NR_SYSCALLS macro with __NR_SYSCALLS Date: Tue, 4 Sep 2018 10:11:25 +0530 Message-ID: <1536036087-15260-3-git-send-email-firoz.khan@linaro.org> In-Reply-To: <1536036087-15260-1-git-send-email-firoz.khan@linaro.org> References: <1536036087-15260-1-git-send-email-firoz.khan@linaro.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: "David S . Miller" , sparclinux@vger.kernel.org, Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , Kate Stewart Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, arnd@arndb.de, deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org, firoz.khan@linaro.org Message-ID: <20180904044125.atsmP8QUQd-qA2PLGsiWsSrATYHzHv9H4V9iEnUja4w@z> NR_syscalls macro holds the number of system call exist in SPARC architecture. This macro is currently the part of uapi/asm/unistd.h file. We have to change the value of NR_syscalls, if we add or delete a system call. One of the patch in this patch series has a script which will generate a uapi header based on syscall.tbl file. The syscall.tbl file contains the number of system call information. So we have two option to update NR_syscalls value. 1. Update NR_syscalls in uapi/asm/unistd.h manually by counting the no.of system calls. No need to update NR_syscalls until we either add a new system call or delete an existing system call. 2. We can keep this feature it above mentioned script, that'll count the number of syscalls and keep it in a generated file. In this case we don't need to explicitly update NR_syscalls in asm/unistd.h file. The 2nd option will be the recommended one. For that, I moved the NR_syscalls macro from uapi/asm/unistd.h to asm/unistd.h. The macro name also changed form NR_syscalls to __NR_syscalls for making the name convention same across all architecture. While __NR_syscalls isn't strictly part of the uapi, having it as part of the generated header to simplifies the implementation. Signed-off-by: Firoz Khan --- arch/sparc/include/asm/unistd.h | 2 ++ arch/sparc/include/uapi/asm/unistd.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index f120b6b..c8849b7 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h @@ -17,6 +17,8 @@ #include +#define NR_syscalls __NR_syscalls + #ifndef __32bit_syscall_numbers__ #ifndef __arch64__ #define __32bit_syscall_numbers__ diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index ccf4bea..e2407b4 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -422,6 +422,6 @@ #define __NR_pwritev2 359 #define __NR_statx 360 -#define NR_syscalls 361 +#define __NR_syscalls 361 #endif /* _UAPI_SPARC_UNISTD_H */ -- 1.9.1