From 003da68e930ae9550071691119898fea21ef288d Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Thu, 23 Nov 2023 18:48:53 +0100
Subject: Fixed ZFS and upgraded.

---
 config | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config b/config
index f15bd7b..7365628 100644
--- a/config
+++ b/config
@@ -363,7 +363,7 @@ CONFIG_X86_MPPARSE=y
 CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
+# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
@@ -397,11 +397,14 @@ CONFIG_ACRN_GUEST=y
 CONFIG_INTEL_TDX_GUEST=y
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
+CONFIG_MCORE2=y
 # CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
+# CONFIG_GENERIC_CPU is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_P6_NOP=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
@@ -434,7 +437,7 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCELOG_LEGACY is not set
 CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_AMD is not set
 CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MCE_INJECT=m
 
@@ -461,10 +464,9 @@ CONFIG_X86_5LEVEL=y
 CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_X86_CPA_STATISTICS=y
 CONFIG_X86_MEM_ENCRYPT=y
-CONFIG_AMD_MEM_ENCRYPT=y
-# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
 CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
+# CONFIG_AMD_NUMA is not set
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NODES_SHIFT=5
@@ -5793,7 +5795,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
-# CONFIG_EDAC_DECODE_MCE is not set
 CONFIG_EDAC_GHES=y
 # CONFIG_EDAC_E752X is not set
 # CONFIG_EDAC_I82975X is not set
@@ -5988,7 +5989,6 @@ CONFIG_VMGENID=y
 # CONFIG_NITRO_ENCLAVES is not set
 # CONFIG_ACRN_HSM is not set
 # CONFIG_EFI_SECRET is not set
-# CONFIG_SEV_GUEST is not set
 # CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
@@ -7849,7 +7849,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
-CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_NUMA_CMA is not set
 
-- 
cgit v1.2.3-70-g09d2