From: Firoz Khan <firoz.khan@linaro.org>
To: linux-alpha@vger.kernel.org, rth@twiddle.net,
ink@jurassic.park.msu.ru, mattst88@gmail.com
Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, arnd@arndb.de,
deepa.kernel@gmail.com, Firoz Khan <firoz.khan@linaro.org>
Subject: [PATCH 4/6] alpha: Replace NR_SYSCALLS macro from asm/unistd.h
Date: Mon, 16 Jul 2018 15:53:56 +0530 [thread overview]
Message-ID: <1531736638-15294-5-git-send-email-firoz.khan@linaro.org> (raw)
In-Reply-To: <1531736638-15294-1-git-send-email-firoz.khan@linaro.org>
Replace NR_SYSCALLS from asm/unistd.h and keep equivalent macro
__NR_syscalls in uapi/asm/unistd.h and this will make a unified
implementation across all the architecture and we can use a system
call generation script to generate __NR_syscalls.
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 <firoz.khan@linaro.org>
---
arch/alpha/include/asm/unistd.h | 2 --
arch/alpha/include/uapi/asm/unistd.h | 2 ++
arch/alpha/kernel/entry.S | 4 ++--
arch/alpha/kernel/systbls.S | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 1d19087..92c3f2e 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -4,8 +4,6 @@
#include <uapi/asm/unistd.h>
-#define NR_SYSCALLS 523
-
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_STAT64
#define __ARCH_WANT_SYS_GETHOSTNAME
diff --git a/arch/alpha/include/uapi/asm/unistd.h b/arch/alpha/include/uapi/asm/unistd.h
index 3bb6ac1..5d4b51e 100644
--- a/arch/alpha/include/uapi/asm/unistd.h
+++ b/arch/alpha/include/uapi/asm/unistd.h
@@ -481,4 +481,6 @@
#define __NR_pwritev2 521
#define __NR_statx 522
+#define __NR_syscalls 523
+
#endif /* _UAPI_ALPHA_UNISTD_H */
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index c64806a..8f0d706 100644
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -454,7 +454,7 @@ entSys:
SAVE_ALL
lda $8, 0x3fff
bic $sp, $8, $8
- lda $4, NR_SYSCALLS($31)
+ lda $4, __NR_syscalls($31)
stq $16, SP_OFF+24($sp)
lda $5, sys_call_table
lda $27, sys_ni_syscall
@@ -585,7 +585,7 @@ strace:
ldq $21, 88($sp)
/* get the system call pointer.. */
- lda $1, NR_SYSCALLS($31)
+ lda $1, __NR_syscalls($31)
lda $2, sys_call_table
lda $27, alpha_ni_syscall
cmpult $0, $1, $1
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 7ef6925..de79de3 100644
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -544,6 +544,6 @@ sys_call_table:
.type sys_call_table, @object
/* Remember to update everything, kids. */
-.ifne (. - sys_call_table) - (NR_SYSCALLS * 8)
+.ifne (. - sys_call_table) - (__NR_syscalls * 8)
.err
.endif
--
2.7.4
next prev parent reply other threads:[~2018-07-16 10:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 10:23 [PATCH 0/6] System call table generation support Firoz Khan
2018-07-16 10:23 ` [PATCH 1/6] alpha: Move __IGNORE* entries to non uapi header Firoz Khan
2018-08-11 19:28 ` Al Viro
2018-08-11 20:59 ` Michael Cree
2018-08-11 22:27 ` Arnd Bergmann
2018-07-16 10:23 ` [PATCH 2/6] alpha: Add CONFIG_OSF4_COMPAT for compat syscall support Firoz Khan
2018-07-16 10:23 ` [PATCH 3/6] alpha: Unify the not-implemented system call entry name Firoz Khan
2018-08-11 0:04 ` Al Viro
2018-08-11 2:31 ` Richard Henderson
2018-08-11 2:45 ` Al Viro
2018-08-11 4:10 ` Richard Henderson
2018-08-11 15:07 ` Al Viro
2018-08-11 15:24 ` Richard Henderson
2018-07-16 10:23 ` Firoz Khan [this message]
2018-07-16 10:23 ` [PATCH 5/6] alpha: Add system call table generation support Firoz Khan
2018-07-16 10:23 ` [PATCH 6/6] alpha: uapi header and system call table file generation Firoz Khan
2018-07-16 16:23 ` kbuild test robot
2018-07-16 14:09 ` [PATCH 0/6] System call table generation support 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531736638-15294-5-git-send-email-firoz.khan@linaro.org \
--to=firoz.khan@linaro.org \
--cc=arnd@arndb.de \
--cc=deepa.kernel@gmail.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=rth@twiddle.net \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).