diff options
| author | Tejun Heo <tj@kernel.org> | 2024-09-04 23:41:32 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-09-04 23:41:32 +0200 |
| commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
| tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /init | |
| parent | sched_ext: Add a cgroup scheduler which uses flattened hierarchy (diff) | |
| parent | selftests/bpf: Do not update vmlinux.h unnecessarily (diff) | |
| download | linux-649e980dadee36f961738d054627225542d547a2.tar.xz linux-649e980dadee36f961738d054627225542d547a2.zip | |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8c11ed61ca67..34cfb0d41b26 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1912,6 +1912,7 @@ config RUST depends on !MODVERSIONS depends on !GCC_PLUGINS depends on !RANDSTRUCT + depends on !SHADOW_CALL_STACK depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE help Enables Rust support in the kernel. @@ -1929,7 +1930,7 @@ config RUST config RUSTC_VERSION_TEXT string depends on RUST - default $(shell,command -v $(RUSTC) >/dev/null 2>&1 && $(RUSTC) --version || echo n) + default "$(shell,$(RUSTC) --version 2>/dev/null)" config BINDGEN_VERSION_TEXT string @@ -1937,7 +1938,7 @@ config BINDGEN_VERSION_TEXT # The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0 # (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when # the minimum version is upgraded past that (0.69.1 already fixed the issue). - default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version workaround-for-0.69.0 || echo n) + default "$(shell,$(BINDGEN) --version workaround-for-0.69.0 2>/dev/null)" # # Place an empty function call at each tracepoint site. Can be |