Commit e256f7b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 7a0892d2 ebd4469e

include/linux/entry-virt.h

+1 −1
Original line number Diff line number Diff line
@@ -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;