mirror of
https://github.com/torvalds/linux.git
synced 2025-10-31 00:28:52 +02:00
62aa6f2ede
Since commitcdd30ebb1b("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>
54 lines
1.6 KiB
Bash
54 lines
1.6 KiB
Bash
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
# Linux kernel symbol namespace import generator
|
|
#
|
|
# This script requires a minimum spatch version.
|
|
SPATCH_REQ_VERSION="1.0.4"
|
|
|
|
DIR="$(dirname $(readlink -f $0))/.."
|
|
SPATCH="`which ${SPATCH:=spatch}`"
|
|
if [ ! -x "$SPATCH" ]; then
|
|
echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
|
|
exit 1
|
|
fi
|
|
|
|
SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
|
|
|
|
if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then
|
|
echo "spatch needs to be version $SPATCH_REQ_VERSION or higher"
|
|
exit 1
|
|
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
|
|
}
|
|
|
|
generate_deps() {
|
|
local mod=${1%.ko:}
|
|
shift
|
|
local namespaces="$*"
|
|
local mod_source_files=$(sed "s|^\(.*\)\.o$|${srcroot}/\1.c|" $mod.mod)
|
|
|
|
for ns in $namespaces; do
|
|
echo "Adding namespace $ns to module $mod.ko."
|
|
generate_deps_for_ns $ns "$mod_source_files"
|
|
# sort the imports
|
|
for source_file in $mod_source_files; do
|
|
sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp
|
|
offset=$(wc -l ${source_file}.tmp | awk '{print $1;}')
|
|
cat $source_file | grep MODULE_IMPORT_NS | LC_ALL=C sort -u >> ${source_file}.tmp
|
|
tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp
|
|
if ! diff -q ${source_file} ${source_file}.tmp; then
|
|
mv ${source_file}.tmp ${source_file}
|
|
else
|
|
rm ${source_file}.tmp
|
|
fi
|
|
done
|
|
done
|
|
}
|
|
|
|
while read line
|
|
do
|
|
generate_deps $line
|
|
done < modules.nsdeps
|