diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2026-10-03 10:21:30 +0200 |
|---|---|---|
| committer | Nathan Chancellor <nathan@kernel.org> | 2026-10-03 10:21:30 +0200 |
| commit | fd79efef14d99da64f39dfc9e471c87bb1b865f3 (patch) | |
| tree | 505290d502356da1660ceb133b65a18353457099 /scripts | |
| parent | 2eaa399a85efad571f4043ec8903e076b73a3dbb (diff) | |
| parent | ac7445c28e7a28d5131bc9f9a143261e79495027 (diff) | |
| download | linux-next-fd79efef14d99da64f39dfc9e471c87bb1b865f3.tar.gz linux-next-fd79efef14d99da64f39dfc9e471c87bb1b865f3.zip | |
Merge commit 'ac7445c28e7a' into kbuild-for-next
Merge the 7.3-rc6 random merge to temporarily resolve a tricky conflict
in -next. Linus will handle this during the merge window.
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Kconfig.toolchain | 5 | ||||
| -rw-r--r-- | scripts/coccinelle/hid/ff_race.cocci | 11 | ||||
| -rw-r--r-- | scripts/generate_rust_target.rs | 5 | ||||
| -rw-r--r-- | scripts/livepatch/init.c | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/scripts/Kconfig.toolchain b/scripts/Kconfig.toolchain index d708a175fe48..c9d2aef4e355 100644 --- a/scripts/Kconfig.toolchain +++ b/scripts/Kconfig.toolchain @@ -247,6 +247,11 @@ config CC_HAS_ALLOC_TOKEN config CC_HAS_MULTIDIMENSIONAL_NONSTRING def_bool $(success,echo 'char tag[][4] __attribute__((__nonstring__)) = { };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror) +config CC_OPT_INLINE_MEMSET + string + default "-finline-stringops=memset" if $(cc-option,-finline-stringops=memset) + default "-mllvm -max-store-memset=4294967294" if $(cc-option,-mllvm -max-store-memset=4294967294) + config LD_CAN_USE_KEEP_IN_OVERLAY # ld.lld prior to 21.0.0 did not support KEEP within an overlay description # https://github.com/llvm/llvm-project/pull/130661 diff --git a/scripts/coccinelle/hid/ff_race.cocci b/scripts/coccinelle/hid/ff_race.cocci index 479f5d1e3184..e861de00cb10 100644 --- a/scripts/coccinelle/hid/ff_race.cocci +++ b/scripts/coccinelle/hid/ff_race.cocci @@ -7,18 +7,19 @@ virtual report -@r@ +@r exists@ identifier probe_fn; -expression hdev, flags; +identifier hdev; +expression flags; position p1, p2; @@ probe_fn(struct hid_device *hdev, ...) { - <... + ... when any hid_hw_start@p1(hdev, flags) ... - \(input_ff_create\|input_ff_create_memless\)@p2(...) - ...> + \(input_ff_create@p2\|input_ff_create_memless@p2\)(...) + ... when any } @script:python depends on report@ diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs index 3bf296581a88..7687b0dd5474 100644 --- a/scripts/generate_rust_target.rs +++ b/scripts/generate_rust_target.rs @@ -224,6 +224,11 @@ fn main() { features += ",+harden-sls-ijmp"; features += ",+harden-sls-ret"; } + if cfg.has("X86_NATIVE_CPU") { + // Prevent the backend from generating APX instructions. The kernel is not yet prepared + // for general in-kernel EGPR use. + features += ",-apxf"; + } ts.push("features", features); ts.push("llvm-target", "x86_64-linux-gnu"); ts.push("supported-sanitizers", ["kcfi", "kernel-address"]); diff --git a/scripts/livepatch/init.c b/scripts/livepatch/init.c index f14d8c8fb35f..16aff8f736eb 100644 --- a/scripts/livepatch/init.c +++ b/scripts/livepatch/init.c @@ -51,7 +51,7 @@ static int __init livepatch_mod_init(void) if (!funcs) { ret = -ENOMEM; for (int j = 0; j < i; j++) - kfree(objs[i].funcs); + kfree(objs[j].funcs); goto err_free_objs; } |