Merge tag 'modules-for-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

Pull modules fix from Jessica Yu:
 "Fix `make nsdeps` for modules composed of multiple source files.

  Since $mod_source_files was not in quotes in the call to
  generate_deps_for_ns(), not all the source files for a module were
  being passed to spatch"

* tag 'modules-for-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  scripts/nsdeps: make sure to pass all module source files to spatch

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/nsdeps b/scripts/nsdeps
index dda6fbac016e..04cea0921673 100644
--- a/scripts/nsdeps
+++ b/scripts/nsdeps
@@ -31,12 +31,12 @@ generate_deps() {
         local mod_file=`echo $@ | sed -e 's/\.ko/\.mod/'`
         local ns_deps_file=`echo $@ | sed -e 's/\.ko/\.ns_deps/'`
         if [ ! -f "$ns_deps_file" ]; then return; fi
-        local mod_source_files=`cat $mod_file | sed -n 1p                      \
+        local mod_source_files="`cat $mod_file | sed -n 1p                      \
                                               | sed -e 's/\.o/\.c/g'           \
-                                              | sed "s|[^ ]* *|${srctree}/&|g"`
+                                              | sed "s|[^ ]* *|${srctree}/&|g"`"
         for ns in `cat $ns_deps_file`; do
                 echo "Adding namespace $ns to module $mod_name (if needed)."
-                generate_deps_for_ns $ns $mod_source_files
+                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