diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 07:59:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 07:59:19 -0700 |
| commit | b9e306e07ed58fc354bbd58124b281dd7dc697b7 (patch) | |
| tree | 2fb12d74fad1396ada7d8baf5b5c378b4363e9e5 /scripts/tags.sh | |
| parent | 685e56d2943bb8bf3b641d85b1b6c69d24f7965f (diff) | |
| parent | a0f9c6f202962d4ca8150730e55bc34021dfebcc (diff) | |
| download | linux-3.10-b9e306e07ed58fc354bbd58124b281dd7dc697b7.tar.gz linux-3.10-b9e306e07ed58fc354bbd58124b281dd7dc697b7.tar.bz2 linux-3.10-b9e306e07ed58fc354bbd58124b281dd7dc697b7.zip | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild updates from Michal Marek:
"Non-critical kbuild changes:
- make coccicheck improvements, but no new semantic patches this time
- make rpm improvements
- make tar-pkg change to include the architecture in the filename.
This is a deliberate incompatibility, but nobody has complained so
far and it is useful if you build for different architectures. It
also matches what the deb-pkg and rpm-pkg targets produce.
- kbuild documentation fix"
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
rpm-pkg: Remove pointless set -e statements
rpm-pkg: Always regenerate the specfile
rpm-pkg: Do not write to the parent directory
rpm-pkg: Do not package the whole source directory
buildtar: Add ARCH to the archive name
Coccinelle: Fix patch output when coccicheck is used with M= and C=
Coccinelle: Add support to the SPFLAGS variable
Coccinelle: Cleanup the setting of the FLAGS and OPTIONS variables
Coccinelle: Restore coccicheck verbosity in ONLINE mode (C=1 or C=2)
scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT
doc: change example to existing Makefile fragment
scripts/tags.sh: Add magic for OFFSET and DEFINE
Diffstat (limited to 'scripts/tags.sh')
| -rwxr-xr-x | scripts/tags.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/tags.sh b/scripts/tags.sh index 26a87e68afe..74f02e4dddd 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -199,7 +199,9 @@ exuberant() --regex-c='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \ --regex-c='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/' \ --regex-c='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/' \ - --regex-c='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/' + --regex-c='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/' \ + --regex-c='/(^\s)OFFSET\((\w*)/\2/v/' \ + --regex-c='/(^\s)DEFINE\((\w*)/\2/v/' all_kconfigs | xargs $1 -a \ --langdef=kconfig --language-force=kconfig \ |