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: (470 commits)
  x86: Fix comments of register/stack access functions
  perf tools: Replace %m with %a in sscanf
  hw-breakpoints: Keep track of user disabled breakpoints
  tracing/syscalls: Make syscall events print callbacks static
  tracing: Add DEFINE_EVENT(), DEFINE_SINGLE_EVENT() support to docbook
  perf: Don't free perf_mmap_data until work has been done
  perf_event: Fix compile error
  perf tools: Fix _GNU_SOURCE macro related strndup() build error
  trace_syscalls: Remove unused syscall_name_to_nr()
  trace_syscalls: Simplify syscall profile
  trace_syscalls: Remove duplicate init_enter_##sname()
  trace_syscalls: Add syscall_nr field to struct syscall_metadata
  trace_syscalls: Remove enter_id exit_id
  trace_syscalls: Set event_enter_##sname->data to its metadata
  trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
  perf_event: Initialize data.period in perf_swevent_hrtimer()
  perf probe: Simplify event naming
  perf probe: Add --list option for listing current probe events
  perf probe: Add argv_split() from lib/argv_split.c
  perf probe: Move probe event utility functions to probe-event.c
  ...

17 files changed, 832 insertions, 770 deletions

diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index 2a4b3bf74033..5acfb1eb4df9 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -31,6 +31,14 @@
                 assign, print, reg, unreg)                      \
         DEFINE_TRACE_FN(name, reg, unreg)
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args) \
+        DEFINE_TRACE(name)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_TRACE(name)
+
 #undef DECLARE_TRACE
 #define DECLARE_TRACE(name, proto, args)        \
         DEFINE_TRACE(name)
@@ -63,6 +71,9 @@
 
 #undef TRACE_EVENT
 #undef TRACE_EVENT_FN
+#undef DECLARE_EVENT_CLASS
+#undef DEFINE_EVENT
+#undef DEFINE_EVENT_PRINT
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */
diff --git a/include/trace/events/bkl.h b/include/trace/events/bkl.h
index 8abd620a490e..1af72dc24278 100644
--- a/include/trace/events/bkl.h
+++ b/include/trace/events/bkl.h
@@ -13,7 +13,7 @@ TRACE_EVENT(lock_kernel,
         TP_ARGS(func, file, line),
 
         TP_STRUCT__entry(
-                __field(        int,            lock_depth              )
+                __field(        int,            depth                   )
                 __field_ext(    const char *,   func, FILTER_PTR_STRING )
                 __field_ext(    const char *,   file, FILTER_PTR_STRING )
                 __field(        int,            line                    )
@@ -21,13 +21,13 @@ TRACE_EVENT(lock_kernel,
 
         TP_fast_assign(
                 /* We want to record the lock_depth after lock is acquired */
-                __entry->lock_depth = current->lock_depth + 1;
+                __entry->depth = current->lock_depth + 1;
                 __entry->func = func;
                 __entry->file = file;
                 __entry->line = line;
         ),
 
-        TP_printk("depth: %d, %s:%d %s()", __entry->lock_depth,
+        TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
                   __entry->file, __entry->line, __entry->func)
 );
 
@@ -38,20 +38,20 @@ TRACE_EVENT(unlock_kernel,
         TP_ARGS(func, file, line),
 
         TP_STRUCT__entry(
-                __field(int,            lock_depth)
-                __field(const char *,   func)
-                __field(const char *,   file)
-                __field(int,            line)
+                __field(int,            depth           )
+                __field(const char *,   func            )
+                __field(const char *,   file            )
+                __field(int,            line            )
         ),
 
         TP_fast_assign(
-                __entry->lock_depth = current->lock_depth;
+                __entry->depth = current->lock_depth;
                 __entry->func = func;
                 __entry->file = file;
                 __entry->line = line;
         ),
 
-        TP_printk("depth: %d, %s:%d %s()", __entry->lock_depth,
+        TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
                   __entry->file, __entry->line, __entry->func)
 );
 
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 00405b5f624a..5fb72733331e 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -8,7 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-TRACE_EVENT(block_rq_abort,
+DECLARE_EVENT_CLASS(block_rq_with_error,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
@@ -40,41 +40,28 @@ TRACE_EVENT(block_rq_abort,
                   __entry->nr_sector, __entry->errors)
 );
 
-TRACE_EVENT(block_rq_insert,
+DEFINE_EVENT(block_rq_with_error, block_rq_abort,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
-        TP_ARGS(q, rq),
+        TP_ARGS(q, rq)
+);
 
-        TP_STRUCT__entry(
-                __field(  dev_t,        dev                     )
-                __field(  sector_t,     sector                  )
-                __field(  unsigned int, nr_sector               )
-                __field(  unsigned int, bytes                   )
-                __array(  char,         rwbs,   6               )
-                __array(  char,         comm,   TASK_COMM_LEN   )
-                __dynamic_array( char,  cmd,    blk_cmd_buf_len(rq)     )
-        ),
+DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
 
-        TP_fast_assign(
-                __entry->dev       = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
-                __entry->sector    = blk_pc_request(rq) ? 0 : blk_rq_pos(rq);
-                __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq);
-                __entry->bytes     = blk_pc_request(rq) ? blk_rq_bytes(rq) : 0;
+        TP_PROTO(struct request_queue *q, struct request *rq),
 
-                blk_fill_rwbs_rq(__entry->rwbs, rq);
-                blk_dump_cmd(__get_str(cmd), rq);
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
+        TP_ARGS(q, rq)
+);
 
-        TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->rwbs, __entry->bytes, __get_str(cmd),
+DEFINE_EVENT(block_rq_with_error, block_rq_complete,
+
+        TP_PROTO(struct request_queue *q, struct request *rq),