archive mirror
 help / color / mirror / Atom feed
From: Firoz Khan <>
To: Geert Uytterhoeven <>,,
	Greg Kroah-Hartman <>,
	Philippe Ombredanne <>,
	Thomas Gleixner <>,
	Kate Stewart <>
Subject: [PATCH v3 2/5] m68k: replace NR_syscalls macro from asm/unistd.h
Date: Mon,  1 Oct 2018 18:07:54 +0530	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

NR_syscalls macro holds the number of system call exist in m68k
architecture. This macro is currently the part of asm/unistd.h file.
We have to change the value of NR_syscalls, if we add or delete a
system call.

One of 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 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

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 come up
with another macro - __NR_syscalls which will be updated by the
script and it will be present in api/asm/unistd.h. While __NR_syscalls
isn't strictly part of the uapi, having it as part of the generated
header to simplifies the implementation. So we need to enclose this
macro with #ifdef __KERNEL__ to avoid side effects.

Signed-off-by: Firoz Khan <>
 arch/m68k/include/asm/unistd.h      | 3 +--
 arch/m68k/include/uapi/asm/unistd.h | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 30d0d3f..5072e94 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -4,8 +4,7 @@
 #include <uapi/asm/unistd.h>
-#define NR_syscalls		380
+#define NR_syscalls __NR_syscalls
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h
index de3054f..ba4176aa 100644
--- a/arch/m68k/include/uapi/asm/unistd.h
+++ b/arch/m68k/include/uapi/asm/unistd.h
@@ -387,4 +387,8 @@
 #define __NR_pwritev2		378
 #define __NR_statx		379
+#ifdef __KERNEL__
+#define __NR_syscalls		380
 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */

  parent reply	other threads:[~2018-10-01 12:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-01 12:37 [PATCH v3 0/5] System call table generation support Firoz Khan
2018-10-01 12:37 ` [PATCH v3 1/5] m68k: rename system call table file name Firoz Khan
2018-10-01 12:37 ` Firoz Khan [this message]
2018-10-01 12:37 ` [PATCH v3 3/5] m68k: add system call table generation support Firoz Khan
2018-10-01 22:52   ` Finn Thain
2018-10-15  4:12     ` Firoz Khan
2018-10-01 12:37 ` [PATCH v3 4/5] m68k: uapi header and system call table file generation Firoz Khan
2018-10-01 12:37 ` [PATCH v3 5/5] m68k: add __IGNORE* entries in asm/unistd.h Firoz Khan
2018-10-01 12:51   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH v3 2/5] m68k: replace NR_syscalls macro from asm/unistd.h' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).