1 files changed, 7 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 344defd0f918..f8d1fd525e17 100644
--- a/Makefile
+++ b/Makefile
@@ -1021,9 +1021,14 @@ ifdef CONFIG_MODULES
 all: modules
 
 #       Build modules
+#
+#       A module can be listed more than once in obj-m resulting in
+#       duplicate lines in modules.order files.  Those are removed
+#       using awk while concatenating to the final file.
 
 PHONY += modules
 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
+        $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
         @echo '  Building modules, stage 2.';
         $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
 
@@ -1051,6 +1056,7 @@ _modinst_:
                 rm -f $(MODLIB)/build ; \
                 ln -s $(objtree) $(MODLIB)/build ; \
         fi
+        @cp -f $(objtree)/modules.order $(MODLIB)/
         $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
 
 # This depmod is only for convenience to give the initial
@@ -1110,7 +1116,7 @@ clean: archclean $(clean-dirs)
         @find . $(RCS_FIND_IGNORE) \
                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
                 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-                -o -name '*.symtypes' \) \
+                -o -name '*.symtypes' -o -name 'modules.order' \) \
                 -type f -print | xargs rm -f
 
 # mrproper - Delete all generated files, including .config