2022-03-29 06:02:40

by CGEL

Subject: [PATCH] alpha: replace NR_SYSCALLS by NR_syscalls

From: Yang Yang <[email protected]>

Reference to other arch likes x86_64 or arm64 to do this replacement.
To solve compile error when using NR_syscalls in kernel[1].

[1] https://lore.kernel.org/all/[email protected]/

Signed-off-by: Yang Yang <[email protected]>
---
arch/alpha/include/asm/unistd.h | 2 +-
arch/alpha/kernel/entry.S | 4 ++--
kernel/trace/trace.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 986f5da9b7d8..caabd92ea709 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -4,7 +4,7 @@

#include <uapi/asm/unistd.h>

-#define NR_SYSCALLS __NR_syscalls
+#define NR_syscalls __NR_syscalls

#define __ARCH_WANT_NEW_STAT
#define __ARCH_WANT_OLD_READDIR
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index e227f3a29a43..966400b925a5 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, sys_ni_syscall
cmpult $0, $1, $1
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 07d990270e2a..7ad8324db192 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -25,7 +25,7 @@
#include "pid_list.h"

#ifdef CONFIG_FTRACE_SYSCALLS
-#include <asm/unistd.h> /* For NR_SYSCALLS */
+#include <asm/unistd.h> /* For NR_syscalls */
#include <asm/syscall.h> /* some archs define it here */
#endif

--
2.25.1

2023-02-26 02:07:38

by Matt Turner

Subject: Re: [PATCH] alpha: replace NR_SYSCALLS by NR_syscalls

On Mon, Mar 28, 2022 at 10:58 PM <[email protected]> wrote:
>
> From: Yang Yang <[email protected]>
>
> Reference to other arch likes x86_64 or arm64 to do this replacement.
> To solve compile error when using NR_syscalls in kernel[1].
>
> [1] https://lore.kernel.org/all/[email protected]/
>
> Signed-off-by: Yang Yang <[email protected]>
> ---
> arch/alpha/include/asm/unistd.h | 2 +-
> arch/alpha/kernel/entry.S | 4 ++--
> kernel/trace/trace.h | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
> index 986f5da9b7d8..caabd92ea709 100644
> --- a/arch/alpha/include/asm/unistd.h
> +++ b/arch/alpha/include/asm/unistd.h
> @@ -4,7 +4,7 @@
>
> #include <uapi/asm/unistd.h>
>
> -#define NR_SYSCALLS __NR_syscalls
> +#define NR_syscalls __NR_syscalls
>
> #define __ARCH_WANT_NEW_STAT
> #define __ARCH_WANT_OLD_READDIR
> diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
> index e227f3a29a43..966400b925a5 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, sys_ni_syscall
> cmpult $0, $1, $1
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index 07d990270e2a..7ad8324db192 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -25,7 +25,7 @@
> #include "pid_list.h"
>
> #ifdef CONFIG_FTRACE_SYSCALLS
> -#include <asm/unistd.h> /* For NR_SYSCALLS */
> +#include <asm/unistd.h> /* For NR_syscalls */
> #include <asm/syscall.h> /* some archs define it here */
> #endif
>
> --
> 2.25.1
>


Thanks for the patch! This was included in my pull request today and
is now upstream in Linus' tree.