fix some kernel 6.12 related kconfig warnings

jens-maus · Jan 9, 2025 · e42a7c1 · e42a7c1
1 parent d72fdc5
commit e42a7c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/buildroot-external/kernel/6.12/global.config b/buildroot-external/kernel/6.12/global.config
@@ -105,6 +105,7 @@ CONFIG_IKCONFIG_PROC=y
 # enable zram and disable zswap because we
 # don't have any swap device/file
 CONFIG_ZRAM=y
+CONFIG_ZRAM_BACKEND_LZ4=y
 CONFIG_ZRAM_DEF_COMP_LZ4=y
 # CONFIG_ZSWAP is not set
 # CONFIG_Z3FOLD is not set
@@ -130,7 +131,6 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_IOSTAT=y
 CONFIG_NTFS_FS=y
-CONFIG_NTFS_RW=y
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZ4=y

diff --git a/buildroot-external/kernel/6.12/security-x86_64.config b/buildroot-external/kernel/6.12/security-x86_64.config
@@ -18,14 +18,13 @@ CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_LEGACY_VSYSCALL_NONE=y
 
 # Enable Kernel Page Table Isolation to remove an entire class of cache timing side-channels.
-CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
 
 # Enable chip-specific IOMMU support. 
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=y
 
 # Straight-Line-Speculation
-CONFIG_SLS=y
+CONFIG_MITIGATION_SLS=y
diff --git a/buildroot-external/kernel/6.12/security.config b/buildroot-external/kernel/6.12/security.config
@@ -11,7 +11,7 @@ CONFIG_MODULE_SIG_FORCE=y
 CONFIG_MODULE_SIG_ALL=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_MODULE_SIG_HASH="sha512"
-CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS is not set
 
 # Make sure kernel page tables have safe permissions.
 CONFIG_STRICT_KERNEL_RWX=y
@@ -102,7 +102,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_UBSAN=y
 CONFIG_UBSAN_TRAP=y
 CONFIG_UBSAN_BOUNDS=y
-CONFIG_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN_SHIFT is not set
 # CONFIG_UBSAN_DIV_ZERO is not set
 # CONFIG_UBSAN_UNREACHABLE is not set