Commit 7a566889 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:

 - Fix conflicts between devicetree and ACPI SMP discovery & setup

 - Fix a warm-boot lockup on AMD SC1100 SoC systems

 - Fix a W=1 build warning related to x86 IRQ trace event setup

 - Fix a kernel-doc warning

* tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry: Fix kernel-doc warning
  x86/irq: Define trace events conditionally
  x86/CPU: Fix warm boot hang regression on AMD SC1100 SoC systems
  x86/of: Don't use DTB for SMP setup if ACPI is enabled
parents d203484f 0f6750b1

arch/x86/entry/common.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static __always_inline bool int80_is_external(void) 


/**

 * do_int80_emulation - 32-bit legacy syscall C entry from asm

 * @regs: syscall arguments in struct pt_args on the stack.

 *

 * This entry point can be used by 32-bit and 64-bit programs to perform

 * 32-bit system calls.  Instances of INT $0x80 can be found inline in

arch/x86/kernel/cpu/cyrix.c

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static void geode_configure(void) 
	u8 ccr3;

	local_irq_save(flags);



	/* Suspend on halt power saving and enable #SUSP pin */

	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);

	/* Suspend on halt power saving */

	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x08);



	ccr3 = getCx86(CX86_CCR3);

	setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10);	/* enable MAPEN */

arch/x86/kernel/devicetree.c

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Architecture specific OF callbacks.

 */

#include <linux/acpi.h>

#include <linux/export.h>

#include <linux/io.h>

#include <linux/interrupt.h>
@@ -313,6 +314,6 @@ void __init x86_flattree_get_config(void) 
	if (initial_dtb)

		early_memunmap(dt, map_len);

#endif

	if (of_have_populated_dt())

	if (acpi_disabled && of_have_populated_dt())

		x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;

}

arch/x86/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ 
#include <asm/posted_intr.h>

#include <asm/irq_remapping.h>



#if defined(CONFIG_X86_LOCAL_APIC) || defined(CONFIG_X86_THERMAL_VECTOR)

#define CREATE_TRACE_POINTS

#include <asm/trace/irq_vectors.h>

#endif



DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);

EXPORT_PER_CPU_SYMBOL(irq_stat);