Commit 44087d3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2025-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:

 - Fix FPU core dumps on certain CPU models

 - Fix htmldocs build warning

 - Export TLB tracing event name via header

 - Remove unused constant from <linux/mm_types.h>

 - Fix comments

 - Fix whitespace noise in documentation

 - Fix variadic structure's definition to un-confuse UBSAN

 - Fix posted MSI interrupts irq_retrigger() bug

 - Fix asm build failure with older GCC builds

* tag 'x86-urgent-2025-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bug: Fix old GCC compile fails
  x86/msi: Make irq_retrigger() functional for posted MSI
  x86/platform/uv: Fix UBSAN array-index-out-of-bounds
  mm: Remove tlb_flush_reason::NR_TLB_FLUSH_REASONS from <linux/mm_types.h>
  x86/mm/tlb/trace: Export the TLB_REMOTE_WRONG_CPU enum in <trace/events/tlb.h>
  x86/sgx: Remove unmatched quote in __sgx_encl_extend function comment
  x86/boot/Documentation: Fix whitespace noise in boot.rst
  x86/fpu: Fix FPU state core dump truncation on CPUs with no extended xfeatures
  x86/boot/Documentation: Fix htmldocs build warning due to malformed table in boot.rst
parents 610192c2 c56a12c7

Documentation/arch/x86/boot.rst

+99 −99
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ Protocol: 2.00+ 


  Assigned boot loader IDs:



	== =======================================

	==== =======================================

	0x0  LILO

	     (0x00 reserved for pre-2.00 bootloader)

	0x1  Loadlin
@@ -456,7 +456,7 @@ Protocol: 2.00+ 
	     <http://sebastian-plotz.blogspot.de>

	0x12 OVMF UEFI virtualization stack

	0x13 barebox

	== =======================================

	==== =======================================



  Please contact <hpa@zytor.com> if you need a bootloader ID value assigned.

arch/x86/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern void __WARN_trap(struct bug_entry *bug, ...); 
/*

 * Despite that some emulators terminate on UD2, we use it for WARN().

 */

#define ASM_UD2		_ASM_BYTES(0x0f, 0x0b)

#define ASM_UD2		__ASM_FORM(ud2)

#define INSN_UD2	0x0b0f

#define LEN_UD2		2

arch/x86/include/asm/irq_remapping.h

+7 −0
Original line number Diff line number Diff line
@@ -87,4 +87,11 @@ static inline void panic_if_irq_remap(const char *msg) 
}



#endif /* CONFIG_IRQ_REMAP */



#ifdef CONFIG_X86_POSTED_MSI

void intel_ack_posted_msi_irq(struct irq_data *irqd);

#else

#define intel_ack_posted_msi_irq	NULL

#endif



#endif /* __X86_IRQ_REMAPPING_H */

arch/x86/include/asm/uv/bios.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct uv_systab { 
	struct {

		u32 type:8;	/* type of entry */

		u32 offset:24;	/* byte offset from struct start to entry */

	} entry[1];		/* additional entries follow */

	} entry[];		/* additional entries follow */

};

extern struct uv_systab *uv_systab;

arch/x86/kernel/cpu/sgx/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int __sgx_encl_add_page(struct sgx_encl *encl, 
/*

 * If the caller requires measurement of the page as a proof for the content,

 * use EEXTEND to add a measurement for 256 bytes of the page. Repeat this

 * operation until the entire page is measured."

 * operation until the entire page is measured.

 */

static int __sgx_encl_extend(struct sgx_encl *encl,

			     struct sgx_epc_page *epc_page)