diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-03 08:53:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-03 08:57:26 +0200 |
| commit | 6a2bcf9277dcbdef88d514113434b45f8ffc5469 (patch) | |
| tree | af426cf4a48d857dc0dc84d4ba88d059e5f16611 /arch/x86/Kconfig | |
| parent | b90169b42a6f49ff2fe2e4d4ed0bbcf17fb8f1bf (diff) | |
| parent | 39cd87c4eb2b893354f3b850f916353f2658ae6f (diff) | |
| download | linux-6a2bcf9277dcbdef88d514113434b45f8ffc5469.tar.gz linux-6a2bcf9277dcbdef88d514113434b45f8ffc5469.tar.bz2 linux-6a2bcf9277dcbdef88d514113434b45f8ffc5469.zip | |
Merge tag 'v6.9-rc2' into x86/percpu, to pick up fixes and resolve conflict
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 03c9d1100f09..f1c020d21617 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -472,10 +472,6 @@ config X86_MPPARSE For old smp systems that do not have proper acpi support. Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it -config GOLDFISH - def_bool y - depends on X86_GOLDFISH - config X86_CPU_RESCTRL bool "x86 CPU resource control support" depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD) @@ -2446,6 +2442,8 @@ config USE_X86_SEG_SUPPORT # address spaces with GCC < 13.3 - see GCC PR sanitizer/111736. # depends on !KASAN || CC_HAS_NAMED_AS_FIXED_ASAN + # -fsanitize=thread (KCSAN) is also incompatible. + depends on !KCSAN config CC_HAS_SLS def_bool $(cc-option,-mharden-sls=all) |