Disable HAVE_ARCH_AUDITSYSCALL and HAVE_ARCH_SOFT_DIRTY. Both options
are untested with SafeFetch enabled as of right now.
---
 arch/x86/Kconfig | 5 +++--
 init/Kconfig     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 71019b3b54ea..b31a8a2dea71 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -31,7 +31,7 @@ config X86_64
        select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
        select ARCH_SUPPORTS_PER_VMA_LOCK
        select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
-       select HAVE_ARCH_SOFT_DIRTY
+       # select HAVE_ARCH_SOFT_DIRTY
        select MODULES_USE_ELF_RELA
        select NEED_DMA_MAP_STATE
        select SWIOTLB
@@ -194,7 +194,7 @@ config X86
        select HAVE_ACPI_APEI                   if ACPI
        select HAVE_ACPI_APEI_NMI               if ACPI
        select HAVE_ALIGNED_STRUCT_PAGE
-       select HAVE_ARCH_AUDITSYSCALL
+       # select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_HUGE_VMAP              if X86_64 || X86_PAE
        select HAVE_ARCH_HUGE_VMALLOC           if X86_64
        select HAVE_ARCH_JUMP_LABEL
@@ -203,6 +203,7 @@ config X86
        select HAVE_ARCH_KASAN_VMALLOC          if X86_64
        select HAVE_ARCH_KFENCE
        select HAVE_ARCH_KMSAN                  if X86_64
+       select HAVE_ARCH_SAFEFETCH              if X86_64
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_MMAP_RND_BITS          if MMU
        select HAVE_ARCH_MMAP_RND_COMPAT_BITS   if MMU && COMPAT
diff --git a/init/Kconfig b/init/Kconfig
index 666783eb50ab..5f365fa06fe8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -494,7 +494,7 @@ config HAVE_ARCH_AUDITSYSCALL
        bool
 
 config AUDITSYSCALL
-       def_bool y
+       def_bool n
        depends on AUDIT && HAVE_ARCH_AUDITSYSCALL
        select FSNOTIFY
 
-- 
2.25.1


Reply via email to