Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
	kernel/trace/ftrace.c

[ We conflicted here because we backported a few fixes to
  tracing/urgent - which has different internal APIs. ]

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
index af3be57,af3be57,19fad00..03a45e7
--- 1/kernel/Makefile
--- 2/kernel/Makefile
--- 3/kernel/Makefile
+++ b/kernel/Makefile
@@@@ -21,12 -21,12 -19,8 +19,12 @@@@ CFLAGS_REMOVE_mutex-debug.o = -p
   CFLAGS_REMOVE_rtmutex-debug.o = -pg
   CFLAGS_REMOVE_cgroup-debug.o = -pg
   CFLAGS_REMOVE_sched_clock.o = -pg
-- CFLAGS_REMOVE_sched.o = -mno-spe -pg
++ CFLAGS_REMOVE_sched.o = -pg
   endif
  +ifdef CONFIG_FUNCTION_RET_TRACER
  +CFLAGS_REMOVE_extable.o = -pg # For __kernel_text_address()
  +CFLAGS_REMOVE_module.o = -pg # For __module_text_address()
  +endif
   
   obj-$(CONFIG_FREEZER) += freezer.o
   obj-$(CONFIG_PROFILING) += profile.o

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
index 2596b5a,24b6238,d86e325..5653c6b
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
--- 3/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@@ -258,9 -258,11 -213,6 +258,9 @@@@ static const char *trace_options[] = 
        "stacktrace",
        "sched-tree",
        "ftrace_printk",
 - #ifdef CONFIG_BRANCH_TRACER
  +     "ftrace_preempt",
 - #endif
  +     "branch",
  +     "annotate",
        NULL
   };
   
@@@@ -541,10 -551,10 -494,11 +549,10 @@@@ int register_tracer(struct tracer *type
                 * internal tracing to verify that everything is in order.
                 * If we fail, we do not register this tracer.
                 */
- -             for_each_tracing_cpu(i) {
+ +             for_each_tracing_cpu(i)
                        tracing_reset(tr, i);
- -             }
+ +
                current_trace = type;
  -             tr->ctrl = 0;
                /* the test is responsible for initializing and enabling */
                pr_info("Testing tracer %s: ", type->name);
                ret = type->selftest(type, tr);