Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
  perf: Fix SIGIO handling
  perf top: Don't stop if no kernel symtab is found
  perf top: Handle kptr_restrict
  perf top: Remove unused macro
  perf events: initialize fd array to -1 instead of 0
  perf tools: Make sure kptr_restrict warnings fit 80 col terms
  perf tools: Fix build on older systems
  perf symbols: Handle /proc/sys/kernel/kptr_restrict
  perf: Remove duplicate headers
  ftrace: Add internal recursive checks
  tracing: Update btrfs's tracepoints to use u64 interface
  tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine
  ftrace: Set ops->flag to enabled even on static function tracing
  tracing: Have event with function tracer check error return
  ftrace: Have ftrace_startup() return failure code
  jump_label: Check entries limit in __jump_label_update
  ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM
  scripts/tags.sh: Add magic for trace-events for etags too
  scripts/tags.sh: Fix ctags for DEFINE_EVENT()
  x86/ftrace: Fix compiler warning in ftrace.c
  ...

2 files changed, 12 insertions, 2 deletions

diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 4be60364a40..f40a6af6bf4 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -43,6 +43,7 @@
 #undef ELF_R_INFO
 #undef Elf_r_info
 #undef ELF_ST_BIND
+#undef ELF_ST_TYPE
 #undef fn_ELF_R_SYM
 #undef fn_ELF_R_INFO
 #undef uint_t
@@ -76,6 +77,7 @@
 # define ELF_R_INFO             ELF64_R_INFO
 # define Elf_r_info             Elf64_r_info
 # define ELF_ST_BIND            ELF64_ST_BIND
+# define ELF_ST_TYPE            ELF64_ST_TYPE
 # define fn_ELF_R_SYM           fn_ELF64_R_SYM
 # define fn_ELF_R_INFO          fn_ELF64_R_INFO
 # define uint_t                 uint64_t
@@ -108,6 +110,7 @@
 # define ELF_R_INFO             ELF32_R_INFO
 # define Elf_r_info             Elf32_r_info
 # define ELF_ST_BIND            ELF32_ST_BIND
+# define ELF_ST_TYPE            ELF32_ST_TYPE
 # define fn_ELF_R_SYM           fn_ELF32_R_SYM
 # define fn_ELF_R_INFO          fn_ELF32_R_INFO
 # define uint_t                 uint32_t
@@ -427,6 +430,11 @@ static unsigned find_secsym_ndx(unsigned const txtndx,
                 if (txtndx == w2(symp->st_shndx)
                         /* avoid STB_WEAK */
                     && (STB_LOCAL == st_bind || STB_GLOBAL == st_bind)) {
+                        /* function symbols on ARM have quirks, avoid them */
+                        if (w2(ehdr->e_machine) == EM_ARM
+                            && ELF_ST_TYPE(symp->st_info) == STT_FUNC)
+                                continue;
+
                         *recvalp = _w(symp->st_value);
                         return symp - sym0;
                 }
diff --git a/scripts/tags.sh b/scripts/tags.sh
index bd6185d529c..75c5d24f199 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -132,7 +132,7 @@ exuberant()
         --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
         --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
         --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
-        --regex-c++='/^DEFINE_EVENT\(([^,)]*).*/trace_\1/'
+        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --langdef=kconfig --language-force=kconfig              \
@@ -152,7 +152,9 @@ emacs()
 {
         all_sources | xargs $1 -a                               \
         --regex='/^ENTRY(\([^)]*\)).*/\1/'                      \
-        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'
+        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
+        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
+        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'