author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Jan 2011 16:29:25 +0000 (08:29 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Jan 2011 16:29:25 +0000 (08:29 -0800) |
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
Documentation/kbuild: add info that 'choice' can have a symbol name
kbuild: add numeric --set-val option to scripts/config
headers_check: Fix warning text
headers_check: better search for functions in headers
scripts/coccinelle: update for compatability with Coccinelle 0.2.4
tags: put function prototypes back!
Kconfig: fix single letter command in scripts/config
gitignore: add scripts/recordmcount
Documentation/kbuild: add info that 'choice' can have a symbol name
kbuild: add numeric --set-val option to scripts/config
headers_check: Fix warning text
headers_check: better search for functions in headers
scripts/coccinelle: update for compatability with Coccinelle 0.2.4
tags: put function prototypes back!
Kconfig: fix single letter command in scripts/config
gitignore: add scripts/recordmcount
1 | 2 | |||
---|---|---|---|---|
Documentation/kbuild/kconfig-language.txt | patch | | diff1 | | diff2 | | blob | history |
scripts/tags.sh | patch | | diff1 | | diff2 | | blob | history |
Simple merge
diff --cc scripts/tags.sh
index bbbe584d44943077a41b22684b5ecdbce18f532a,e091db312ddb048ecf5eb2057627dc182121b8ab..92fdc4546141125a14410af0b8d4b1ce8464e2fe
--- 1/scripts/tags.sh
--- 2/scripts/tags.sh
+++ b/scripts/tags.sh
-I ____cacheline_internodealigned_in_smp \
-I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
-I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
- --extra=+f --c-kinds=-px \
+ --extra=+f --c-kinds=+px \
--regex-asm='/^ENTRY\(([^)]*)\).*/\1/' \
- --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'
+ --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
+ --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/' \
+ --regex-c++='/^DEFINE_EVENT\(([^,)]*).*/trace_\1/'
all_kconfigs | xargs $1 -a \
--langdef=kconfig --language-force=kconfig \