Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-3
+1
arch/x86/entry/common.c
+1
arch/x86/entry/common.c
···
190
190
191
191
/**
192
192
* do_int80_emulation - 32-bit legacy syscall C entry from asm
193
+
* @regs: syscall arguments in struct pt_args on the stack.
193
194
*
194
195
* This entry point can be used by 32-bit and 64-bit programs to perform
195
196
* 32-bit system calls. Instances of INT $0x80 can be found inline in
+2
-2
arch/x86/kernel/cpu/cyrix.c
+2
-2
arch/x86/kernel/cpu/cyrix.c
···
153
153
u8 ccr3;
154
154
local_irq_save(flags);
155
155
156
-
/* Suspend on halt power saving and enable #SUSP pin */
157
-
setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
156
+
/* Suspend on halt power saving */
157
+
setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x08);
158
158
159
159
ccr3 = getCx86(CX86_CCR3);
160
160
setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
+2
-1
arch/x86/kernel/devicetree.c
+2
-1
arch/x86/kernel/devicetree.c
···
2
2
/*
3
3
* Architecture specific OF callbacks.
4
4
*/
5
+
#include <linux/acpi.h>
5
6
#include <linux/export.h>
6
7
#include <linux/io.h>
7
8
#include <linux/interrupt.h>
···
314
313
if (initial_dtb)
315
314
early_memunmap(dt, map_len);
316
315
#endif
317
-
if (of_have_populated_dt())
316
+
if (acpi_disabled && of_have_populated_dt())
318
317
x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;
319
318
}
+2
arch/x86/kernel/irq.c
+2
arch/x86/kernel/irq.c
···
25
25
#include <asm/posted_intr.h>
26
26
#include <asm/irq_remapping.h>
27
27
28
+
#if defined(CONFIG_X86_LOCAL_APIC) || defined(CONFIG_X86_THERMAL_VECTOR)
28
29
#define CREATE_TRACE_POINTS
29
30
#include <asm/trace/irq_vectors.h>
31
+
#endif
30
32
31
33
DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
32
34
EXPORT_PER_CPU_SYMBOL(irq_stat);