[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <174212289213.14745.11904990695632151378.tip-bot2@tip-bot2>
Date: Sun, 16 Mar 2025 11:01:31 -0000
From: "tip-bot2 for Brian Gerst" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Sohil Mehta <sohil.mehta@...el.com>, Brian Gerst <brgerst@...il.com>,
Ingo Molnar <mingo@...nel.org>, Andy Lutomirski <luto@...nel.org>,
"H. Peter Anvin" <hpa@...or.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Josh Poimboeuf <jpoimboe@...hat.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/cpu] x86/syscall/32: Add comment to conditional
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: fe35c87ad8e7795e1ab020ce2023e952806353d0
Gitweb: https://git.kernel.org/tip/fe35c87ad8e7795e1ab020ce2023e952806353d0
Author: Brian Gerst <brgerst@...il.com>
AuthorDate: Fri, 14 Mar 2025 11:12:20 -04:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Sun, 16 Mar 2025 11:49:42 +01:00
x86/syscall/32: Add comment to conditional
Add a CONFIG_X86_FRED comment, since this conditional is nested.
Suggested-by: Sohil Mehta <sohil.mehta@...el.com>
Signed-off-by: Brian Gerst <brgerst@...il.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Reviewed-by: Sohil Mehta <sohil.mehta@...el.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Link: https://lore.kernel.org/r/20250314151220.862768-8-brgerst@gmail.com
---
arch/x86/entry/syscall_32.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/entry/syscall_32.c b/arch/x86/entry/syscall_32.c
index 993d725..2b15ea1 100644
--- a/arch/x86/entry/syscall_32.c
+++ b/arch/x86/entry/syscall_32.c
@@ -238,7 +238,8 @@ DEFINE_FREDENTRY_RAW(int80_emulation)
instrumentation_end();
syscall_exit_to_user_mode(regs);
}
-#endif
+#endif /* CONFIG_X86_FRED */
+
#else /* CONFIG_IA32_EMULATION */
/* Handles int $0x80 on a 32bit kernel */
Powered by blists - more mailing lists