linux-kernel - [tip: x86/entry] x86/unistd: Define X32_NR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <162151701394.29796.3420253526498482459.tip-bot2@tip-bot2>
Date:   Thu, 20 May 2021 13:23:33 -0000
From:   "tip-bot2 for Masahiro Yamada" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Masahiro Yamada <masahiroy@...nel.org>,
        Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: x86/entry] x86/unistd: Define X32_NR_syscalls only for 64-bit kernel

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@...nel.org>
AuthorDate:    Mon, 17 May 2021 16:38:12 +09:00
Committer:     Thomas Gleixner <tglx@...utronix.de>
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@...nel.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lore.kernel.org/r/20210517073815.97426-5-masahiroy@kernel.org

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