diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-19 11:03:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-19 11:03:06 +0100 |
| commit | 89771319e0f11314fcf6d22fcdd0c41e2d157ddc (patch) | |
| tree | db7d5bddaa727f844aab9001f171fdaa214267f4 /init | |
| parent | 6d536cad0d55e71442b6d65500f74eb85544269e (diff) | |
| parent | 4701f33a10702d5fc577c32434eb62adde0a1ae1 (diff) | |
Merge tag 'v6.14-rc7' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index a0ea04c17784..9906ba51e80e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1968,7 +1968,7 @@ config RUST depends on !MODVERSIONS || GENDWARFKSYMS depends on !GCC_PLUGIN_RANDSTRUCT depends on !RANDSTRUCT - depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE + depends on !DEBUG_INFO_BTF || (PAHOLE_HAS_LANG_EXCLUDE && !LTO) depends on !CFI_CLANG || HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG depends on !CALL_PADDING || RUSTC_VERSION >= 108100 |