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

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
  tracing/kprobes: unregister_trace_probe needs to be called under mutex
  perf: expose event__process function
  perf events: Fix mmap offset determination
  perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
  perf, powerpc: Convert the FSL driver to use local64_t
  perf tools: Don't keep unreferenced maps when unmaps are detected
  perf session: Invalidate last_match when removing threads from rb_tree
  perf session: Free the ref_reloc_sym memory at the right place
  x86,mmiotrace: Add support for tracing STOS instruction
  perf, sched migration: Librarize task states and event headers helpers
  perf, sched migration: Librarize the GUI class
  perf, sched migration: Make the GUI class client agnostic
  perf, sched migration: Make it vertically scrollable
  perf, sched migration: Parameterize cpu height and spacing
  perf, sched migration: Fix key bindings
  perf, sched migration: Ignore unhandled task states
  perf, sched migration: Handle ignored migrate out events
  perf: New migration tool overview
  tracing: Drop cpparg() macro
  perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
  ...

Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c

1 files changed, 8 insertions, 15 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 5a64905d7278..a9377c0083ad 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -75,15 +75,12 @@
 #define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
         DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
 
-#undef __cpparg
-#define __cpparg(arg...) arg
-
 /* Callbacks are meaningless to ftrace. */
 #undef TRACE_EVENT_FN
 #define TRACE_EVENT_FN(name, proto, args, tstruct,                      \
                 assign, print, reg, unreg)                              \
-        TRACE_EVENT(name, __cpparg(proto), __cpparg(args),              \
-                __cpparg(tstruct), __cpparg(assign), __cpparg(print))   \
+        TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
+                PARAMS(tstruct), PARAMS(assign), PARAMS(print))         \
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
@@ -145,7 +142,7 @@
  *      struct trace_seq *s = &iter->seq;
  *      struct ftrace_raw_<call> *field; <-- defined in stage 1
  *      struct trace_entry *entry;
- *      struct trace_seq *p;
+ *      struct trace_seq *p = &iter->tmp_seq;
  *      int ret;
  *
  *      entry = iter->ent;
@@ -157,12 +154,10 @@
  *
  *      field = (typeof(field))entry;
  *
- *      p = &get_cpu_var(ftrace_event_seq);
  *      trace_seq_init(p);
  *      ret = trace_seq_printf(s, "%s: ", <call>);
  *      if (ret)
  *              ret = trace_seq_printf(s, <TP_printk> "\n");
- *      put_cpu();
  *      if (!ret)
  *              return TRACE_TYPE_PARTIAL_LINE;
  *
@@ -216,7 +211,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
         struct trace_seq *s = &iter->seq;                               \
         struct ftrace_raw_##call *field;                                \
         struct trace_entry *entry;                                      \
-        struct trace_seq *p;                                            \
+        struct trace_seq *p = &iter->tmp_seq;                           \
         int ret;                                                        \
                                                                         \
         event = container_of(trace_event, struct ftrace_event_call,     \
@@ -231,12 +226,10 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
                                                                         \
         field = (typeof(field))entry;                                   \
                                                                         \
-        p = &get_cpu_var(ftrace_event_seq);                             \
         trace_seq_init(p);                                              \
         ret = trace_seq_printf(s, "%s: ", event->name);                 \
         if (ret)                                                        \
                 ret = trace_seq_printf(s, print);                       \
-        put_cpu();                                                      \
         if (!ret)                                                       \
                 return TRACE_TYPE_PARTIAL_LINE;                         \
                                                                         \
@@ -255,7 +248,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
         struct trace_seq *s = &iter->seq;                               \
         struct ftrace_raw_##template *field;                            \
         struct trace_entry *entry;                                      \
-        struct trace_seq *p;                                            \
+        struct trace_seq *p = &iter->tmp_seq;                           \
         int ret;                                                        \
                                                                         \
         entry = iter->ent;                                              \
@@ -267,12 +260,10 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
                                                                         \
         field = (typeof(field))entry;                                   \
                                                                         \
-        p = &get_cpu_var(ftrace_event_seq);                             \
         trace_seq_init(p);                                              \
         ret = trace_seq_printf(s, "%s: ", #call);                       \
         if (ret)                                                        \
                 ret = trace_seq_printf(s, print);                       \
-        put_cpu();                                                      \
         if (!ret)                                                       \
                 return TRACE_TYPE_PARTIAL_LINE;                         \
                                                                         \
@@ -439,6 +430,7 @@ static inline notrace int ftrace_get_offsets_##call(			\
  *      .fields                 = LIST_HEAD_INIT(event_class_##call.fields),
  *      .raw_init               = trace_event_raw_init,
  *      .probe                  = ftrace_raw_event_##call,
+ *      .reg                    = ftrace_event_reg,
  * };
  *
  * static struct ftrace_event_call __used
@@ -567,6 +559,7 @@ static struct ftrace_event_class __used event_class_##call = {		\
         .fields                 = LIST_HEAD_INIT(event_class_##call.fields),\
         .raw_init               = trace_event_raw_init,                 \
         .probe                  = ftrace_raw_event_##call,              \
+        .reg                    = ftrace_event_reg,                     \
         _TRACE_PERF_INIT(call)                                          \
 };
 
@@ -705,7 +698,7 @@ perf_trace_##call(void *__data, proto)					\
         int __data_size;                                                \
         int rctx;                                                       \
                                                                         \
-        perf_fetch_caller_regs(&__regs, 1);                             \
+        perf_fetch_caller_regs(&__regs);                                \
                                                                         \
         __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
         __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),\