1 files changed, 7 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 55bced17dc95..b3a1a5d77d92 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -41,6 +41,7 @@ config X86
         select ARCH_USE_CMPXCHG_LOCKREF         if X86_64
         select ARCH_USE_QUEUED_RWLOCKS
         select ARCH_USE_QUEUED_SPINLOCKS
+        select ARCH_WANTS_DYNAMIC_TASK_STRUCT
         select ARCH_WANT_FRAME_POINTERS
         select ARCH_WANT_IPC_PARSE_VERSION      if X86_32
         select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -254,6 +255,11 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
         def_bool y
 
+config KASAN_SHADOW_OFFSET
+        hex
+        depends on KASAN
+        default 0xdffffc0000000000
+
 config HAVE_INTEL_TXT
         def_bool y
         depends on INTEL_IOMMU && ACPI
@@ -2015,7 +2021,7 @@ config CMDLINE_BOOL
 
           To compile command line arguments into the kernel,
           set this option to 'Y', then fill in the
-          the boot arguments in CONFIG_CMDLINE.
+          boot arguments in CONFIG_CMDLINE.
 
           Systems with fully functional boot loaders (i.e. non-embedded)
           should leave this option set to 'N'.