Commit d9241b22 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:
 - deb-pkg:
     + module signing fix
     + dtb files are added to the package
     + do not require `hostname -f` to work during build
     + make deb-pkg generates a source package, bindeb-pkg has been
       added to only generate the binary package
 - rpm-pkg packages /lib/modules as well
 - new coccinelle patch and updates to existing ones
 - new stackusage & stackdelta script to collect and compare stack usage
   info (using gcc's -fstack-usage)
 - make tags understands trace_*_rcuidle() macros
 - .gitignore updates, misc cleanups

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (27 commits)
  deb-pkg: add source package
  package/Makefile: move source tar creation to a function
  scripts: add stackdelta script
  kbuild: remove *.su files generated by -fstack-usage
  .gitignore: add *.su pattern
  scripts: add stackusage script
  kbuild: avoid listing /lib/modules in kernel spec file
  fallback to hostname in scripts/package/builddeb
  coccinelle: api: extend spatch for dropping unnecessary owner
  deb-pkg: simplify directory creation
  scripts/tags.sh: Include trace_*_rcuidle() in tags
  scripts/package/Makefile: rpmbuild is needed for rpm targets
  Kbuild: Add ID files to .gitignore
  gitignore: Add MIPS vmlinux.32 to the list
  coccinelle: simple_return: Add a blank line
  coccinelle: irqf_oneshot.cocci: Improve the generated commit log
  coccinelle: api: add vma_pages.cocci
  scripts/coccinelle/misc/irqf_oneshot.cocci: Fix grammar
  scripts/coccinelle/misc/semicolon.cocci: Use imperative mood
  coccinelle: simple_open: Use imperative mood
  ...
parents 605e9710 3716001b

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
modules.builtin

Module.symvers

*.dwo

*.su



#

# Top-level generic files
@@ -44,6 +45,7 @@ Module.symvers 
/TAGS

/linux

/vmlinux

/vmlinux.32

/vmlinux-gdb.py

/vmlinuz

/System.map
@@ -89,6 +91,9 @@ GRTAGS 
GSYMS

GTAGS



# id-utils files

ID



*.orig

*~

\#*#

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ clean: $(clean-dirs) 
		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '*.ko.*' \

		-o -name '*.dwo'  \

		-o -name '*.su'  \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

scripts/coccinelle/api/platform_no_drv_owner.cocci

+73 −0
Original line number Diff line number Diff line
@@ -9,11 +9,14 @@ virtual org 
virtual report



@match1@

declarer name module_i2c_driver;

declarer name module_platform_driver;

declarer name module_platform_driver_probe;

identifier __driver;

@@

(

	module_i2c_driver(__driver);

|

	module_platform_driver(__driver);

|

	module_platform_driver_probe(__driver, ...);
@@ -28,6 +31,15 @@ identifier match1.__driver; 
		}

	};



@fix1_i2c depends on match1 && patch && !context && !org && !report@

identifier match1.__driver;

@@

	static struct i2c_driver __driver = {

		.driver = {

-			.owner = THIS_MODULE,

		}

	};



@match2@

identifier __driver;

@@
@@ -37,6 +49,8 @@ identifier __driver; 
	platform_driver_probe(&__driver, ...)

|

	platform_create_bundle(&__driver, ...)

|

	i2c_add_driver(&__driver)

)



@fix2 depends on match2 && patch && !context && !org && !report@
@@ -48,6 +62,15 @@ identifier match2.__driver; 
		}

	};



@fix2_i2c depends on match2 && patch && !context && !org && !report@

identifier match2.__driver;

@@

	static struct i2c_driver __driver = {

		.driver = {

-			.owner = THIS_MODULE,

		}

	};



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



@fix1_context depends on match1 && !patch && (context || org || report)@
@@ -61,6 +84,17 @@ position j0; 
		}

	};



@fix1_i2c_context depends on match1 && !patch && (context || org || report)@

identifier match1.__driver;

position j0;

@@



	static struct i2c_driver __driver = {

		.driver = {

*			.owner@j0 = THIS_MODULE,

		}

	};



@fix2_context depends on match2 && !patch && (context || org || report)@

identifier match2.__driver;

position j0;
@@ -72,6 +106,17 @@ position j0; 
		}

	};



@fix2_i2c_context depends on match2 && !patch && (context || org || report)@

identifier match2.__driver;

position j0;

@@



	static struct i2c_driver __driver = {

		.driver = {

*			.owner@j0 = THIS_MODULE,

		}

	};



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



@script:python fix1_org depends on org@
@@ -81,6 +126,13 @@ j0 << fix1_context.j0; 
msg = "No need to set .owner here. The core will do it."

coccilib.org.print_todo(j0[0], msg)



@script:python fix1_i2c_org depends on org@

j0 << fix1_i2c_context.j0;

@@



msg = "No need to set .owner here. The core will do it."

coccilib.org.print_todo(j0[0], msg)



@script:python fix2_org depends on org@

j0 << fix2_context.j0;

@@
@@ -88,6 +140,13 @@ j0 << fix2_context.j0; 
msg = "No need to set .owner here. The core will do it."

coccilib.org.print_todo(j0[0], msg)



@script:python fix2_i2c_org depends on org@

j0 << fix2_i2c_context.j0;

@@



msg = "No need to set .owner here. The core will do it."

coccilib.org.print_todo(j0[0], msg)



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



@script:python fix1_report depends on report@
@@ -97,6 +156,13 @@ j0 << fix1_context.j0; 
msg = "No need to set .owner here. The core will do it."

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



@script:python fix1_i2c_report depends on report@

j0 << fix1_i2c_context.j0;

@@



msg = "No need to set .owner here. The core will do it."

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



@script:python fix2_report depends on report@

j0 << fix2_context.j0;

@@
@@ -104,3 +170,10 @@ j0 << fix2_context.j0; 
msg = "No need to set .owner here. The core will do it."

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



@script:python fix2_i2c_report depends on report@

j0 << fix2_i2c_context.j0;

@@



msg = "No need to set .owner here. The core will do it."

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

scripts/coccinelle/api/pm_runtime.cocci

+1 −1
Original line number Diff line number Diff line 
/// Make sure pm_runtime_* calls does not use unnecessary IS_ERR_VALUE

//

///

// Keywords: pm_runtime

// Confidence: Medium

// Copyright (C) 2013 Texas Instruments Incorporated - GPLv2.

scripts/coccinelle/api/simple_open.cocci

+2 −2
Original line number Diff line number Diff line 
/// This removes an open coded simple_open() function

/// and replaces file operations references to the function

/// Remove an open coded simple_open() function

/// and replace file operations references to the function

/// with simple_open() instead.

///

// Confidence: High

CRA Git | Maintained and supported by SUSTech CRA and CCSE