The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: "tip-bot2 for Brian Gerst" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sohil Mehta <sohil.mehta@intel.com>,
	Brian Gerst <brgerst@gmail.com>, Ingo Molnar <mingo@kernel.org>,
	Andy Lutomirski <luto@kernel.org>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] x86/syscall/32: Add comment to conditional
Date: Wed, 19 Mar 2025 11:03:47 -0000	[thread overview]
Message-ID: <174238222755.14745.11123777162384005162.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250314151220.862768-8-brgerst@gmail.com>

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

Commit-ID:     82070bc0425db949b406ede1c7f066346f5b3eb9
Gitweb:        https://git.kernel.org/tip/82070bc0425db949b406ede1c7f066346f5b3eb9
Author:        Brian Gerst <brgerst@gmail.com>
AuthorDate:    Fri, 14 Mar 2025 11:12:20 -04:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 19 Mar 2025 11:19:20 +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@intel.com>
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.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 */

  parent reply	other threads:[~2025-03-19 11:03 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-14 15:12 [PATCH v2 0/7] x86/entry: Break up common.c Brian Gerst
2025-03-14 15:12 ` [PATCH v2 1/7] x86/xen: Move Xen upcall handler Brian Gerst
2025-03-14 15:16   ` Juergen Gross
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 2/7] x86/syscall/32: Move 32-bit syscall dispatch code Brian Gerst
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 3/7] x86/syscall/64: Move 64-bit " Brian Gerst
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 4/7] x86/syscall/x32: Move x32 syscall table Brian Gerst
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 5/7] x86/syscall: Move sys_ni_syscall() Brian Gerst
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 6/7] x86/syscall: Remove stray semicolons Brian Gerst
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 7/7] x86/syscall/32: Add comment to conditional Brian Gerst
2025-03-14 17:19   ` Sohil Mehta
2025-03-14 17:43     ` Brian Gerst
2025-03-14 18:30       ` H. Peter Anvin
2025-03-16 11:01   ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03   ` tip-bot2 for Brian Gerst [this message]
2025-03-14 17:22 ` [PATCH v2 0/7] x86/entry: Break up common.c Sohil Mehta

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=174238222755.14745.11123777162384005162.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=brgerst@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@kernel.org \
    --cc=sohil.mehta@intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.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