Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-28 16:56:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/nsdeps: get 'make nsdeps' working again

Browse Source 
Since commit cdd30ebb1b ("module: Convert symbol namespace to string
literal"), when MODULE_IMPORT_NS() is missing, 'make nsdeps' inserts
pointless code:

    MODULE_IMPORT_NS("ns");

Here, "ns" is not a namespace, but the variable in the semantic patch.
It must not be quoted. Instead, a string literal must be passed to
Coccinelle.

Fixes: cdd30ebb1b ("module: Convert symbol namespace to string literal")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Masahiro Yamada 2024-12-03 19:21:05 +09:00 committed by Linus Torvalds
parent cdd30ebb1b
commit 62aa6f2ede
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/coccinelle/misc/add_namespace.cocci
View File

@ -13,7 +13,7 @@ virtual report
declarer name MODULE_IMPORT_NS; declarer name MODULE_IMPORT_NS;
identifier virtual.ns; identifier virtual.ns;
@@ @@
MODULE_IMPORT_NS("ns"); MODULE_IMPORT_NS(ns);
// Add missing imports, but only adjacent to a MODULE_LICENSE statement. // Add missing imports, but only adjacent to a MODULE_LICENSE statement.
// That ensures we are adding it only to the main module source file. // That ensures we are adding it only to the main module source file.
@ -23,7 +23,7 @@ expression license;
identifier virtual.ns; identifier virtual.ns;
@@ @@
MODULE_LICENSE(license); MODULE_LICENSE(license);
+ MODULE_IMPORT_NS("ns"); + MODULE_IMPORT_NS(ns);
// Dummy rule for report mode that would otherwise be empty and make spatch // Dummy rule for report mode that would otherwise be empty and make spatch
// fail ("No rules apply.") // fail ("No rules apply.")

2
scripts/nsdeps
View File

@ -21,7 +21,7 @@ fi
generate_deps_for_ns() { generate_deps_for_ns() {
$SPATCH --very-quiet --in-place --sp-file \ $SPATCH --very-quiet --in-place --sp-file \
$srctree/scripts/coccinelle/misc/add_namespace.cocci -D nsdeps -D ns=$1 $2 $srctree/scripts/coccinelle/misc/add_namespace.cocci -D nsdeps -D ns=\"$1\" $2
} }
generate_deps() { generate_deps() {