Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
  ftrace: Add function names to dangling } in function graph tracer
  tracing: Simplify memory recycle of trace_define_field
  tracing: Remove unnecessary variable in print_graph_return
  tracing: Fix typo of info text in trace_kprobe.c
  tracing: Fix typo in prof_sysexit_enable()
  tracing: Remove CONFIG_TRACE_POWER from kernel config
  tracing: Fix ftrace_event_call alignment for use with gcc 4.5
  ftrace: Remove memory barriers from NMI code when not needed
  tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API
  s390: Add pt_regs register and stack access API
  tracing/kprobes: Make Kconfig dependencies generic
  tracing: Unify arch_syscall_addr() implementations
  tracing: Add notrace to TRACE_EVENT implementation functions
  ftrace: Allow to remove a single function from function graph filter
  tracing: Add correct/incorrect to sort keys for branch annotation output
  tracing: Simplify test for function_graph tracing start point
  tracing: Drop the tr check from the graph tracing path
  tracing: Add stack dump to trace_printk if stacktrace option is set
  tracing: Use appropriate perl constructs in recordmcount.pl
  tracing: optimize recordmcount.pl for offsets-handling
  ...

diff --combined arch/Kconfig
index 06a1372,50877ef..215e460
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -3,9 -3,11 +3,9 @@@
  #
  
  config OPROFILE
 -      tristate "OProfile system profiling (EXPERIMENTAL)"
 +      tristate "OProfile system profiling"
        depends on PROFILING
        depends on HAVE_OPROFILE
 -      depends on TRACING_SUPPORT
 -      select TRACING
        select RING_BUFFER
        select RING_BUFFER_ALLOW_SWAP
        help
@@@ -15,6 -17,20 +15,6 @@@
  
          If unsure, say N.
  
 -config OPROFILE_IBS
 -      bool "OProfile AMD IBS support (EXPERIMENTAL)"
 -      default n
 -      depends on OPROFILE && SMP && X86
 -      help
 -          Instruction-Based Sampling (IBS) is a new profiling
 -          technique that provides rich, precise program performance
 -          information. IBS is introduced by AMD Family10h processors
 -          (AMD Opteron Quad-Core processor "Barcelona") to overcome
 -          the limitations of conventional performance counter
 -          sampling.
 -
 -        If unsure, say N.
 -
  config OPROFILE_EVENT_MULTIPLEX
        bool "OProfile multiplexing support (EXPERIMENTAL)"
        default n
@@@ -105,6 -121,14 +105,14 @@@ config HAVE_DMA_ATTR
  config USE_GENERIC_SMP_HELPERS
        bool
  
+ config HAVE_REGS_AND_STACK_ACCESS_API
+       bool
+       help
+         This symbol should be selected by an architecure if it supports
+         the API needed to access registers and stack entries from pt_regs,
+         declared in asm/ptrace.h
+         For example the kprobes-based event tracer needs this API.
+ 
  config HAVE_CLK
        bool
        help

diff --combined arch/s390/Kconfig
index 19deda8,2590ce2..0d8cd9b
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -54,9 -54,6 +54,9 @@@ config GENERIC_BU
        depends on BUG
        default y
  
 +config GENERIC_BUG_RELATIVE_POINTERS
 +      def_bool y
 +
  config NO_IOMEM
        def_bool y
  
@@@ -90,6 -87,7 +90,7 @@@ config S39
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_DEFAULT_NO_SPIN_MUTEXES
        select HAVE_OPROFILE
        select HAVE_KPROBES
@@@ -98,9 -96,6 +99,9 @@@
        select HAVE_ARCH_TRACEHOOK
        select INIT_ALL_POSSIBLE
        select HAVE_PERF_EVENTS
 +      select HAVE_KERNEL_GZIP
 +      select HAVE_KERNEL_BZIP2
 +      select HAVE_KERNEL_LZMA
        select ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
        select ARCH_INLINE_SPIN_LOCK

diff --combined arch/s390/kernel/ftrace.c
index 314d8f0,9e69449..6a83d05
--- 1/arch/s390/kernel/ftrace.c
--- 2/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@@ -13,7 -13,7 +13,7 @@@
  #include <linux/kernel.h>
  #include <linux/types.h>
  #include <trace/syscall.h>
 -#include <asm/lowcore.h>
 +#include <asm/asm-offsets.h>
  
  #ifdef CONFIG_DYNAMIC_FTRACE
  
@@@ -200,13 -200,3 +200,3 @@@ out
        return parent;
  }
  #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
- 
- #ifdef CONFIG_FTRACE_SYSCALLS
- 
- extern unsigned int sys_call_table[];
- 
- unsigned long __init arch_syscall_addr(int nr)
- {
-       return (unsigned long)sys_call_table[nr];
- }
- #endif