Merge tag 'core-urgent-2025-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

e256f7b4 · Linus Torvalds <[email protected]> · 2025-11-15 08:46:18 -08:00

Pull core fix from Ingo Molnar:
 "Fix a broken #ifndef in the <linux/entry-virt.h> header.

  It hasn't caused problems upstream yet because no arch overrides
  arch_xfer_to_guest_mode_handle_work() at this moment"

* tag 'core-urgent-2025-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  entry: Fix ifndef around arch_xfer_to_guest_mode_handle_work() stub

Commit: e256f7b4e57d9f1149efd0e7745f77d8e615177b
Parents: 7a0892d2 · ebd4469e

Merge commit. Changes below are compared with the first parent: 7a0892d2.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
include/linux/entry-virt.h	modified	+1	−1	View file

include/linux/entry-virt.h

View file

diff --git a/include/linux/entry-virt.h b/include/linux/entry-virt.h
index 42c89e3..bfa7677 100644
--- a/include/linux/entry-virt.h
+++ b/include/linux/entry-virt.h
@@ -32,7 +32,7 @@
  */
 static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work);
 
-#ifndef arch_xfer_to_guest_mode_work
+#ifndef arch_xfer_to_guest_mode_handle_work
 static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work)
 {
 	return 0;