From: John Audia <therealgraysky@proton.me>
Date: Sat, 13 Dec 2025 21:07:28 +0000 (-0500)
Subject: x86: 6.18: import new options
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a4b01f154a27fc4e5e2e61ceaae834dfdca8c75;p=thirdparty%2Fopenwrt.git

x86: 6.18: import new options

Some options here were identified by running:
make kernel_oldconfig while others were manually added from a list
curated by hand at build time.

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/21078
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/x86/config-6.18 b/target/linux/x86/config-6.18
index a5cf124928f..f8b45cdba10 100644
--- a/target/linux/x86/config-6.18
+++ b/target/linux/x86/config-6.18
@@ -7,6 +7,7 @@
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIX is not set
 CONFIG_AMD_NB=y
+CONFIG_AMD_NODE=y
 CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
@@ -150,6 +151,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_GENERIC_ENTRY=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_ENTRY=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_GENERIC_IRQ_SHOW=y
@@ -159,6 +161,7 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_SYSCALL=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
@@ -464,6 +467,7 @@ CONFIG_X86=y
 CONFIG_X86_32=y
 # CONFIG_X86_32_IRIS is not set
 # CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_BUS_LOCK_DETECT=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG64=y
@@ -499,6 +503,7 @@ CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=6
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=y
+# CONFIG_X86_NATIVE_CPU is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_PAE is not set
 CONFIG_X86_PAT=y
@@ -509,6 +514,8 @@ CONFIG_X86_PLATFORM_DEVICES=y
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_SGX=y
+# CONFIG_X86_SGX_KVM is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_SMI is not set