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:
  perf tools: Fix sample size bit operations
  perf tools: Fix ommitted mmap data update on remap
  watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
  watchdog: Disable watchdog when thresh is zero
  watchdog: Only disable/enable watchdog if neccessary
  watchdog: Fix rounding bug in get_sample_period()
  perf tools: Propagate event parse error handling
  perf tools: Robustify dynamic sample content fetch
  perf tools: Pre-check sample size before parsing
  perf tools: Move evlist sample helpers to evlist area
  perf tools: Remove junk code in mmap size handling
  perf tools: Check we are able to read the event size on mmap

1 files changed, 31 insertions, 15 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 1023f67633a4..252b72a5e59e 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -9,21 +9,21 @@
 #include "thread_map.h"
 
 static const char *perf_event__names[] = {
-        [0]                      = "TOTAL",
-        [PERF_RECORD_MMAP]       = "MMAP",
-        [PERF_RECORD_LOST]       = "LOST",
-        [PERF_RECORD_COMM]       = "COMM",
-        [PERF_RECORD_EXIT]       = "EXIT",
-        [PERF_RECORD_THROTTLE]   = "THROTTLE",
-        [PERF_RECORD_UNTHROTTLE] = "UNTHROTTLE",
-        [PERF_RECORD_FORK]       = "FORK",
-        [PERF_RECORD_READ]       = "READ",
-        [PERF_RECORD_SAMPLE]     = "SAMPLE",
-        [PERF_RECORD_HEADER_ATTR]        = "ATTR",
-        [PERF_RECORD_HEADER_EVENT_TYPE]  = "EVENT_TYPE",
-        [PERF_RECORD_HEADER_TRACING_DATA]        = "TRACING_DATA",
-        [PERF_RECORD_HEADER_BUILD_ID]    = "BUILD_ID",
-        [PERF_RECORD_FINISHED_ROUND]     = "FINISHED_ROUND",
+        [0]                                     = "TOTAL",
+        [PERF_RECORD_MMAP]                      = "MMAP",
+        [PERF_RECORD_LOST]                      = "LOST",
+        [PERF_RECORD_COMM]                      = "COMM",
+        [PERF_RECORD_EXIT]                      = "EXIT",
+        [PERF_RECORD_THROTTLE]                  = "THROTTLE",
+        [PERF_RECORD_UNTHROTTLE]                = "UNTHROTTLE",
+        [PERF_RECORD_FORK]                      = "FORK",
+        [PERF_RECORD_READ]                      = "READ",
+        [PERF_RECORD_SAMPLE]                    = "SAMPLE",
+        [PERF_RECORD_HEADER_ATTR]               = "ATTR",
+        [PERF_RECORD_HEADER_EVENT_TYPE]         = "EVENT_TYPE",
+        [PERF_RECORD_HEADER_TRACING_DATA]       = "TRACING_DATA",
+        [PERF_RECORD_HEADER_BUILD_ID]           = "BUILD_ID",
+        [PERF_RECORD_FINISHED_ROUND]            = "FINISHED_ROUND",
 };
 
 const char *perf_event__name(unsigned int id)
@@ -35,6 +35,22 @@ const char *perf_event__name(unsigned int id)
         return perf_event__names[id];
 }
 
+int perf_sample_size(u64 sample_type)
+{
+        u64 mask = sample_type & PERF_SAMPLE_MASK;
+        int size = 0;
+        int i;
+
+        for (i = 0; i < 64; i++) {
+                if (mask & (1UL << i))
+                        size++;
+        }
+
+        size *= sizeof(u64);
+
+        return size;
+}
+
 static struct perf_sample synth_sample = {
         .pid       = -1,
         .tid       = -1,