2 files changed, 24 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 5812ec9a56b7..d4dd2e4a045a 100644
--- a/Makefile
+++ b/Makefile
@@ -1396,7 +1396,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files))
 # Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
-                   $(KERNELRELEASE)
+                   $(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"
 
 # Create temporary dir for module support files
 # clean it up only when building all modules
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 2ae481703141..122599b1c13b 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -2,16 +2,36 @@
 #
 # A depmod wrapper used by the toplevel Makefile
 
-if test $# -ne 2; then
-        echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
+if test $# -ne 3; then
+        echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2
         exit 1
 fi
 DEPMOD=$1
 KERNELRELEASE=$2
+SYMBOL_PREFIX=$3
 
 if ! test -r System.map -a -x "$DEPMOD"; then
         exit 0
 fi
+
+# older versions of depmod don't support -P <symbol-prefix>
+# support was added in module-init-tools 3.13
+if test -n "$SYMBOL_PREFIX"; then
+        release=$("$DEPMOD" --version)
+        package=$(echo "$release" | cut -d' ' -f 1)
+        if test "$package" = "module-init-tools"; then
+                version=$(echo "$release" | cut -d' ' -f 2)
+                later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1)
+                if test "$later" != "$version"; then
+                        # module-init-tools < 3.13, drop the symbol prefix
+                        SYMBOL_PREFIX=""
+                fi
+        fi
+        if test -n "$SYMBOL_PREFIX"; then
+                SYMBOL_PREFIX="-P $SYMBOL_PREFIX"
+        fi
+fi
+
 # older versions of depmod require the version string to start with three
 # numbers, so we cheat with a symlink here
 depmod_hack_needed=true
@@ -34,7 +54,7 @@ set -- -ae -F System.map
 if test -n "$INSTALL_MOD_PATH"; then
         set -- "$@" -b "$INSTALL_MOD_PATH"
 fi
-"$DEPMOD" "$@" "$KERNELRELEASE"
+"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX
 ret=$?
 
 if $depmod_hack_needed; then