From 490e23cdf498d6aedb449c9dc606ae4e114d18b7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 11 Sep 2019 11:09:50 -0700 Subject: [PATCH] copy-builtin: SPL must be in Kbuild first (again) Commit bced7e3 accidentally reintroduced issue #7595 which was previously addressed by 517d247. Re-apply the original fix to resolve the issue and include a comment to make it clear the ordering is important. Reviewed-by: Ryan Moeller Reviewed-by: Matthew Thode Signed-off-by: Brian Behlendorf Closes #9302 Closes #9208 --- copy-builtin | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/copy-builtin b/copy-builtin index c108cfc673..ee3b081cae 100755 --- a/copy-builtin +++ b/copy-builtin @@ -12,9 +12,16 @@ usage() KERNEL_DIR="$(readlink --canonicalize-existing "$1")" MODULES=() + +# When integrated in to a monolithic kernel the spl module must appear +# first. This ensures its module initialization function is run before +# any of the other module initialization functions which depend on it. +MODULES+="spl" + for MODULE_DIR in module/* module/os/linux/* do [ -d "$MODULE_DIR" ] || continue + [ "spl" = "${MODULE_DIR##*/}" ] && continue [ "os" = "${MODULE_DIR#*/}" ] && continue MODULES+=("${MODULE_DIR#*/}") done