Commit 62aa6f2e authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

scripts/nsdeps: get 'make nsdeps' working again 



Since commit cdd30ebb ("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: cdd30ebb ("module: Convert symbol namespace to string literal")
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cdd30ebb

scripts/coccinelle/misc/add_namespace.cocci

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ virtual report 
declarer name MODULE_IMPORT_NS;

identifier virtual.ns;

@@

MODULE_IMPORT_NS("ns");

MODULE_IMPORT_NS(ns);



// Add missing imports, but only adjacent to a MODULE_LICENSE statement.

// That ensures we are adding it only to the main module source file.
@@ -23,7 +23,7 @@ expression license; 
identifier virtual.ns;

@@

MODULE_LICENSE(license);

+ MODULE_IMPORT_NS("ns");

+ MODULE_IMPORT_NS(ns);



// Dummy rule for report mode that would otherwise be empty and make spatch

// fail ("No rules apply.")

scripts/nsdeps

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ fi 


generate_deps_for_ns() {

	$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() {