From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 16:29:25 +0000 (-0800)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: accepted/tizen/common/20141203.182822~9249
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3166331a3288dd7184548896a1c7ab682f0dbe8;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'misc' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* '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
---

e3166331a3288dd7184548896a1c7ab682f0dbe8
diff --cc scripts/tags.sh
index bbbe584,e091db3..92fdc45
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -123,11 -123,9 +123,11 @@@ exuberant(
  	-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              \