1 files changed, 22 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 6d419f67939c..0f84c742ed0e 100644
--- a/Makefile
+++ b/Makefile
@@ -520,6 +520,11 @@ KBUILD_CFLAGS	+= -g
 KBUILD_AFLAGS   += -gdwarf-2
 endif
 
+# We trigger additional mismatches with less inlining
+ifdef CONFIG_DEBUG_SECTION_MISMATCH
+KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
+endif
+
 # Force gcc to behave correct even for buggy distributions
 KBUILD_CFLAGS         += $(call cc-option, -fno-stack-protector)
 
@@ -793,7 +798,7 @@ define rule_vmlinux-modpost
 endef
 
 # vmlinux image - including updated kernel symbols
-vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE
+vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
 ifdef CONFIG_HEADERS_CHECK
         $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
@@ -804,7 +809,9 @@ endif
         $(call if_changed_rule,vmlinux__)
         $(Q)rm -f .old_version
 
-vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
+# build vmlinux.o first to catch section mismatch errors early
+$(kallsyms.o): vmlinux.o
+vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
         $(call if_changed_rule,vmlinux-modpost)
 
 # The actual objects are generated when descending, 
@@ -1021,9 +1028,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 +1063,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 +1123,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
@@ -1175,7 +1188,7 @@ help:
         @echo  '  dir/            - Build all files in dir and below'
         @echo  '  dir/file.[ois]  - Build specified target only'
         @echo  '  dir/file.ko     - Build module including final link'
-        @echo  '  rpm             - Build a kernel as an RPM package'
+        @echo  '  prepare         - Set up for building external modules'
         @echo  '  tags/TAGS       - Generate tags file for editors'
         @echo  '  cscope          - Generate cscope index'
         @echo  '  kernelrelease   - Output the release version string'
@@ -1188,6 +1201,8 @@ help:
         @echo  'Static analysers'
         @echo  '  checkstack      - Generate a list of stack hogs'
         @echo  '  namespacecheck  - Name space analysis on compiled kernel'
+        @echo  '  versioncheck    - Sanity check on version.h usage'
+        @echo  '  includecheck    - Check for duplicate included header files'
         @echo  '  export_report   - List the usages of all exported symbols'
         @if [ -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
          echo  '  headers_check   - Sanity check on exported headers'; \
@@ -1371,6 +1386,7 @@ define xtags
         if $1 --version 2>&1 | grep -iq exuberant; then \
             $(all-sources) | xargs $1 -a \
                 -I __initdata,__exitdata,__acquires,__releases \
+                -I __read_mostly,____cacheline_aligned,____cacheline_aligned_in_smp,____cacheline_internodealigned_in_smp \
                 -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
                 --extra=+f --c-kinds=+px \
                 --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'; \
@@ -1428,12 +1444,12 @@ tags: FORCE
 includecheck:
         find * $(RCS_FIND_IGNORE) \
                 -name '*.[hcS]' -type f -print | sort \
-                | xargs $(PERL) -w scripts/checkincludes.pl
+                | xargs $(PERL) -w $(srctree)/scripts/checkincludes.pl
 
 versioncheck:
         find * $(RCS_FIND_IGNORE) \
                 -name '*.[hcS]' -type f -print | sort \
-                | xargs $(PERL) -w scripts/checkversion.pl
+                | xargs $(PERL) -w $(srctree)/scripts/checkversion.pl
 
 namespacecheck:
         $(PERL) $(srctree)/scripts/namespace.pl