diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 03:42:50 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 03:42:50 +0100 |
commit | 70c5eb84738cba88e08526fa14e06418cb2bd473 (patch) | |
tree | 36b586e8dc7e5dff570a18d030d222380edeec44 /scripts/coccinelle/api/pm_runtime.cocci | |
parent | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff) | |
parent | kbuild/mkspec: clean boot loader configuration on rpm removal (diff) | |
download | linux-70c5eb84738cba88e08526fa14e06418cb2bd473.tar.xz linux-70c5eb84738cba88e08526fa14e06418cb2bd473.zip |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild misc updates from Michal Marek:
"The non-critical part of kbuild for v4.6-rc1:
- coccinelle cleanup and a new patch
- make tags rule for kprobe helpers
- make rpm fix to avoid spurious grub2 entries
- make rpm support for %postun script (Fedora only at the moment)"
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild/mkspec: clean boot loader configuration on rpm removal
kbuild/mkspec: fix grub2 installkernel issue
Coccinelle: Add api/setup_timer.cocci
coccinelle: bugon: reduce rule applicability
Coccinelle: pm_runtime: reduce rule applicability
Coccinelle: array_size: reduce rule applicability
Coccinelle: reduce rule applicability
scripts/tags.sh: add regex to map kprobe helpers
scripts/coccinelle: modernize &
Diffstat (limited to 'scripts/coccinelle/api/pm_runtime.cocci')
-rw-r--r-- | scripts/coccinelle/api/pm_runtime.cocci | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/coccinelle/api/pm_runtime.cocci b/scripts/coccinelle/api/pm_runtime.cocci index b7042d074078..89b98a2f7a6f 100644 --- a/scripts/coccinelle/api/pm_runtime.cocci +++ b/scripts/coccinelle/api/pm_runtime.cocci @@ -78,7 +78,7 @@ ret = pm_runtime_api(...); // For org and report mode //---------------------------------------------------------- -@r depends on runtime_bad_err_handle exists@ +@r depends on runtime_bad_err_handle && (org || report) exists@ position p1, p2; identifier pm_runtime_api; expression ret; |