Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fdb2d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild misc updates from Michal Marek:
 "This is the non-critical part of kbuild for v3.16-rc1:
   - make deb-pkg can do s390x and arm64
   - new patterns in scripts/tags.sh
   - scripts/tags.sh skips userspace tools' sources (which sometimes
     have copies of kernel structures) and symlinks
   - improvements to the objdiff tool
   - two new coccinelle patches
   - other minor fixes"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts: objdiff: support directories for the augument of record command
  scripts: objdiff: fix a comment
  scripts: objdiff: change the extension of disassembly from .o to .dis
  scripts: objdiff: improve path flexibility for record command
  scripts: objdiff: remove unnecessary code
  scripts: objdiff: direct error messages to stderr
  scripts: objdiff: get the path to .tmp_objdiff more simply
  deb-pkg: Add automatic support for s390x architecture
  coccicheck: Add unneeded return variable test
  kbuild: Fix a typo in documentation
  kbuild: trivial - use tabs for code indent where possible
  kbuild: trivial - remove trailing empty lines
  coccinelle: Check for missing NULL terminators in of_device_id tables
  scripts/tags.sh: ignore symlink'ed source files
  scripts/tags.sh: add regular expression replacement pattern for memcg
  builddeb: add arm64 in the supported architectures
  builddeb: use $OBJCOPY variable instead of objcopy
  scripts/tags.sh: ignore code of user space tools
  scripts/tags.sh: add pattern for DEFINE_HASHTABLE
  .gitignore: ignore Module.symvers in all directories
parents 1700ff82 7fa0e6db

.gitignore

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
*.lst

*.symtypes

*.order

modules.builtin

*.elf

*.bin

*.gz
@@ -33,6 +32,8 @@ modules.builtin 
*.lzo

*.patch

*.gcno

modules.builtin

Module.symvers



#

# Top-level generic files
@@ -44,7 +45,6 @@ modules.builtin 
/vmlinuz

/System.map

/Module.markers

/Module.symvers



#

# Debian directory (make deb-pkg)

Documentation/kbuild/modules.txt

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ build. 


	Sometimes, an external module uses exported symbols from

	another external module. kbuild needs to have full knowledge of

	all symbols to avoid spliitting out warnings about undefined

	all symbols to avoid spitting out warnings about undefined

	symbols. Three solutions exist for this situation.



	NOTE: The method with a top-level kbuild file is recommended

scripts/Makefile.asm-generic

+0 −1
Original line number Diff line number Diff line
@@ -21,4 +21,3 @@ all: $(patsubst %, $(obj)/%, $(generic-y)) 


$(obj)/%.h:

	$(call cmd,wrap)

scripts/Makefile.host

+0 −1
Original line number Diff line number Diff line
@@ -167,4 +167,3 @@ $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE 


targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\

	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)

scripts/checkstack.pl

+0 −1
Original line number Diff line number Diff line
@@ -173,4 +173,3 @@ while (my $line = <STDIN>) { 


# Sort output by size (last field)

print sort { ($b =~ /:\t*(\d+)$/)[0] <=> ($a =~ /:\t*(\d+)$/)[0] } @stack;