Commit 905cec41 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 changes from Michal Marek:
 "The non-critical part of kbuild for 3.5 includes

   - two new coccinelle checks
   - fix for make deb-pkg to include generated headers in arch/*/include

  I have more make-deb-pkg fixes in the backlog, but these will likely
  have to wait for 3.6."

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  builddeb: include autogenerated header files
  scripts/coccinelle: sizeof of pointer
  scripts/coccinelle: address test is always true
parents da85d342 19a4b988

scripts/coccinelle/misc/ifaddr.cocci

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/// the address of a variable or field is non-zero is likely always to bo

/// non-zero

///

// Confidence: High

// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.

// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.

// URL: http://coccinelle.lip6.fr/

// Comments:

// Options: -no_includes -include_headers



virtual org

virtual report

virtual context



@r@

expression x;

statement S1,S2;

position p;

@@



*if@p (&x)

 S1 else S2



@script:python depends on org@

p << r.p;

@@



cocci.print_main("test of a variable/field address",p)



@script:python depends on report@

p << r.p;

@@



msg = "ERROR: test of a variable/field address"

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

scripts/coccinelle/misc/noderef.cocci

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/// sizeof when applied to a pointer typed expression gives the size of

/// the pointer

///

// Confidence: High

// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.

// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.

// URL: http://coccinelle.lip6.fr/

// Comments:

// Options: -no_includes -include_headers



virtual org

virtual report

virtual context

virtual patch



@depends on patch@

expression *x;

expression f;

type T;

@@



(

x = <+... sizeof(

- x

+ *x

   ) ...+>

|

f(...,(T)(x),...,sizeof(

- x

+ *x

   ),...)

|

f(...,sizeof(x),...,(T)(

- x

+ *x

   ),...)

)



@r depends on !patch@

expression *x;

expression f;

position p;

type T;

@@



(

*x = <+... sizeof@p(x) ...+>

|

*f(...,(T)(x),...,sizeof@p(x),...)

|

*f(...,sizeof@p(x),...,(T)(x),...)

)



@script:python depends on org@

p << r.p;

@@



cocci.print_main("application of sizeof to pointer",p)



@script:python depends on report@

p << r.p;

@@



msg = "ERROR: application of sizeof to pointer"

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

scripts/package/builddeb

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ fi 
# Build header package

(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")

(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")

(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

destdir=$kernel_headers_dir/usr/src/linux-headers-$version

mkdir -p "$destdir"

(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)

CRA Git | Maintained and supported by SUSTech CRA and CCSE