diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-06 12:33:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-06 12:33:09 -0700 |
| commit | b236920731dd90c3fba8c227aa0c4dee5351a639 (patch) | |
| tree | 24d095759ec105c21956c8d8efc02f432edbb4ff /init | |
| parent | d1d10cea0895264cc3769e4d9719baa94f4b250b (diff) | |
| parent | 8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b (diff) | |
Merge tag 'rust-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust fixes from Miguel Ojeda:
- Two changes to prepare for the future Rust 1.91.0 release (expected
2025-10-30, currently in nightly): a target specification format
change and a renamed, soon-to-be-stabilized 'core' function.
* tag 'rust-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
rust: support Rust >= 1.91.0 target spec
rust: use the new name Location::file_as_c_str() in Rust >= 1.91.0
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index d811cad02a75..e3eb63eadc87 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -146,6 +146,9 @@ config RUSTC_HAS_UNNECESSARY_TRANSMUTES config RUSTC_HAS_FILE_WITH_NUL def_bool RUSTC_VERSION >= 108900 +config RUSTC_HAS_FILE_AS_C_STR + def_bool RUSTC_VERSION >= 109100 + config PAHOLE_VERSION int default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE)) |