[tip: x86/entry] x86/unistd: Define X32_NR_syscalls only for 64-bit kernel

From: tip-bot2 for Masahiro Yamada
Date: Thu May 20 2021 - 09:24:12 EST


The following commit has been merged into the x86/entry branch of tip:

Commit-ID: f63815eb1d909a4121806e60928108ff040bf291
Gitweb: https://git.kernel.org/tip/f63815eb1d909a4121806e60928108ff040bf291
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
AuthorDate: Mon, 17 May 2021 16:38:12 +09:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 20 May 2021 15:03:59 +02:00

x86/unistd: Define X32_NR_syscalls only for 64-bit kernel

X32_NR_syscalls is needed only when building a 64bit kernel.

Move it to proper #ifdef guard.

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210517073815.97426-5-masahiroy@xxxxxxxxxx

---
arch/x86/include/asm/unistd.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index c1c3d31..1bc6020 100644
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -26,11 +26,11 @@
# define __ARCH_WANT_COMPAT_SYS_PWRITEV64
# define __ARCH_WANT_COMPAT_SYS_PREADV64V2
# define __ARCH_WANT_COMPAT_SYS_PWRITEV64V2
+# define X32_NR_syscalls (__NR_x32_syscall_max + 1)

# endif

# define NR_syscalls (__NR_syscall_max + 1)
-# define X32_NR_syscalls (__NR_x32_syscall_max + 1)
# define IA32_NR_syscalls (__NR_ia32_syscall_max + 1)

# define __ARCH_WANT_NEW_STAT