[PATCH v2 1/3] microblaze: replace __NR_syscalls macro from asm/unistd.h

From: Firoz Khan
Date: Mon Oct 01 2018 - 08:43:53 EST


__NR_syscalls macro holds the number of system call exist in this
architecture. This macro is currently the part of asm/unistd.h file.
We have 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 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 asm/unistd.h to uapi/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. We also
need to enclose this macro with #ifdef __KERNEL__ to avoid side
effects.

Signed-off-by: Firoz Khan <firoz.khan@xxxxxxxxxx>
---
arch/microblaze/include/asm/unistd.h | 2 --
arch/microblaze/include/uapi/asm/unistd.h | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index a62d094..e19550f 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -38,6 +38,4 @@

#endif /* __ASSEMBLY__ */

-#define __NR_syscalls 401
-
#endif /* _ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h
index 7a9f16a..ed9c6f5 100644
--- a/arch/microblaze/include/uapi/asm/unistd.h
+++ b/arch/microblaze/include/uapi/asm/unistd.h
@@ -418,4 +418,8 @@
#define __NR_io_pgetevents 399
#define __NR_rseq 400

+#ifdef __KERNEL__
+#define __NR_syscalls 401
+#endif
+
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
--
1.9.1