Commit 899552d6 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 misc kbuild updates from Michal Marek:
 "This is the non-critical part of kbuild for 3.17-rc1:

   - make help hint to use make -s with make kernelrelease et al.
   - moved a kbuild document to Documentation/kbuild where it belongs
   - four new Coccinelle scripts, one dropped and one fixed
   - new make kselftest target to run various tests on the kernel"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: kselftest - new make target to build and run kernel selftests
  Coccinelle: Script to replace if and BUG with BUG_ON
  Coccinelle: Script to detect incorrect argument to sizeof
  Coccinelle: Script to use ARRAY_SIZE instead of division of two sizeofs
  Coccinelle: Script to detect cast after memory allocation
  coccinelle/null: solve parse error
  Documentation: headers_install.txt is part of kbuild
  kbuild: make -s should be used with kernelrelease/kernelversion/image_name
parents 3b7b3e6e 5a5da78b

Documentation/kbuild/00-INDEX

+2 −0
Original line number Diff line number Diff line 
00-INDEX

	- this file: info on the kernel build process

headers_install.txt

	- how to export Linux headers for use by userspace

kbuild.txt

	- developer information on kbuild

kconfig.txt

Makefile

+15 −3
Original line number Diff line number Diff line
@@ -1063,6 +1063,13 @@ headers_check: headers_install 
	$(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1



# ---------------------------------------------------------------------------

# Kernel selftest



PHONY += kselftest

kselftest:

	$(Q)$(MAKE) -C tools/testing/selftests run_tests



# ---------------------------------------------------------------------------

# Modules
@@ -1250,9 +1257,9 @@ help: 
	@echo  '  tags/TAGS	  - Generate tags file for editors'

	@echo  '  cscope	  - Generate cscope index'

	@echo  '  gtags           - Generate GNU GLOBAL index'

	@echo  '  kernelrelease	  - Output the release version string'

	@echo  '  kernelversion	  - Output the version stored in Makefile'

	@echo  '  image_name	  - Output the image name'

	@echo  '  kernelrelease	  - Output the release version string (use with make -s)'

	@echo  '  kernelversion	  - Output the version stored in Makefile (use with make -s)'

	@echo  '  image_name	  - Output the image name (use with make -s)'

	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \

	 echo  '                    (default: $(INSTALL_HDR_PATH))'; \

	 echo  ''
@@ -1266,6 +1273,11 @@ help: 
	@echo  '  headerdep       - Detect inclusion cycles in headers'

	@$(MAKE) -f $(srctree)/scripts/Makefile.help checker-help

	@echo  ''

	@echo  'Kernel selftest'

	@echo  '  kselftest       - Build and run kernel selftest (run as root)'

	@echo  '                    Build, install, and boot kernel before'

	@echo  '                    running kselftest on it'

	@echo  ''

	@echo  'Kernel packaging:'

	@$(MAKE) $(build)=$(package-dir) help

	@echo  ''

scripts/coccinelle/api/alloc/alloc_cast.cocci

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/// Remove casting the values returned by memory allocation functions

/// like kmalloc, kzalloc, kmem_cache_alloc, kmem_cache_zalloc etc.

///

//# This makes an effort to find cases of casting of values returned by

//# kmalloc, kzalloc, kcalloc, kmem_cache_alloc, kmem_cache_zalloc,

//# kmem_cache_alloc_node, kmalloc_node and kzalloc_node and removes

//# the casting as it is not required. The result in the patch case may

//#need some reformatting.

//

// Confidence: High

// Copyright: 2014, Himangi Saraogi  GPLv2.

// Comments:

// Options: --no-includes --include-headers

//



virtual context

virtual patch

virtual org

virtual report



//----------------------------------------------------------

//  For context mode

//----------------------------------------------------------



@depends on context@

type T;

@@



* (T *)

  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)



//----------------------------------------------------------

//  For patch mode

//----------------------------------------------------------



@depends on patch@

type T;

@@



- (T *)

  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))



//----------------------------------------------------------

//  For org and report mode

//----------------------------------------------------------



@r depends on org || report@

type T;

position p;

@@



 (T@p *)\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)



@script:python depends on org@

p << r.p;

t << r.T;

@@



coccilib.org.print_safe_todo(p[0], t)



@script:python depends on report@

p << r.p;

t << r.T;

@@



msg="WARNING: casting value returned by memory allocation function to (%s *) is useless." % (t)

coccilib.report.print_report(p[0], msg)

scripts/coccinelle/misc/array_size.cocci

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/// Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element

///

//# This makes an effort to find cases where ARRAY_SIZE can be used such as

//# where there is a division of sizeof the array by the sizeof its first

//# element or by any indexed element or the element type. It replaces the

//# division of the two sizeofs by ARRAY_SIZE.

//

// Confidence: High

// Copyright: (C) 2014 Himangi Saraogi.  GPLv2.

// Comments:

// Options: --no-includes --include-headers



virtual patch

virtual context

virtual org

virtual report



@i@

@@



#include <linux/kernel.h>



//----------------------------------------------------------

//  For context mode

//----------------------------------------------------------



@depends on i&&context@

type T;

T[] E;

@@

(

* (sizeof(E)/sizeof(*E))

|

* (sizeof(E)/sizeof(E[...]))

|

* (sizeof(E)/sizeof(T))

)



//----------------------------------------------------------

//  For patch mode

//----------------------------------------------------------



@depends on i&&patch@

type T;

T[] E;

@@

(

- (sizeof(E)/sizeof(*E))

+ ARRAY_SIZE(E)

|

- (sizeof(E)/sizeof(E[...]))

+ ARRAY_SIZE(E)

|

- (sizeof(E)/sizeof(T))

+ ARRAY_SIZE(E)

)



//----------------------------------------------------------

//  For org and report mode

//----------------------------------------------------------



@r@

type T;

T[] E;

position p;

@@

(

 (sizeof(E)@p /sizeof(*E))

|

 (sizeof(E)@p /sizeof(E[...]))

|

 (sizeof(E)@p /sizeof(T))

)



@script:python depends on i&&org@

p << r.p;

@@



coccilib.org.print_todo(p[0], "WARNING should use ARRAY_SIZE")



@script:python depends on i&&report@

p << r.p;

@@



msg="WARNING: Use ARRAY_SIZE"

coccilib.report.print_report(p[0], msg)

CRA Git | Maintained and supported by SUSTech CRA and CCSE