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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf session: Make events_stats u64 to avoid overflow on 32-bit arches
  hw-breakpoints: Fix hardware breakpoints -> perf events dependency
  perf events: Dont report side-band events on each cpu for per-task-per-cpu events
  perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
  perf events, x86/stacktrace: Make stack walking optional
  perf events: Remove unused perf_counter.h header file
  perf probe: Check new event name
  kprobe-tracer: Check new event/group name
  perf probe: Check whether debugfs path is correct
  perf probe: Fix libdwarf include path for Debian

3 files changed, 49 insertions, 29 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 8027309b0422..690a96d0467c 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -95,8 +95,8 @@ typedef union event_union {
 } event_t;
 
 struct events_stats {
-        unsigned long total;
-        unsigned long lost;
+        u64 total;
+        u64 lost;
 };
 
 void event__print_totals(void);
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 2ca62154f79b..29465d440043 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -62,6 +62,18 @@ static int e_snprintf(char *str, size_t size, const char *format, ...)
         return ret;
 }
 
+/* Check the name is good for event/group */
+static bool check_event_name(const char *name)
+{
+        if (!isalpha(*name) && *name != '_')
+                return false;
+        while (*++name != '\0') {
+                if (!isalpha(*name) && !isdigit(*name) && *name != '_')
+                        return false;
+        }
+        return true;
+}
+
 /* Parse probepoint definition. */
 static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)
 {
@@ -82,6 +94,9 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)
                 ptr = strchr(arg, ':');
                 if (ptr)        /* Group name is not supported yet. */
                         semantic_error("Group name is not supported yet.");
+                if (!check_event_name(arg))
+                        semantic_error("%s is bad for event name -it must "
+                                       "follow C symbol-naming rule.", arg);
                 pp->event = strdup(arg);
                 arg = tmp;
         }
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 5e4050ce2963..a4086aaddb73 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -1,9 +1,9 @@
 #ifndef _PROBE_FINDER_H
 #define _PROBE_FINDER_H
 
-#define MAX_PATH_LEN 256
-#define MAX_PROBE_BUFFER 1024
-#define MAX_PROBES 128
+#define MAX_PATH_LEN             256
+#define MAX_PROBE_BUFFER        1024
+#define MAX_PROBES               128
 
 static inline int is_c_varname(const char *name)
 {
@@ -12,48 +12,53 @@ static inline int is_c_varname(const char *name)
 }
 
 struct probe_point {
-        char    *event;         /* Event name */
-        char    *group;         /* Event group */
+        char                    *event;                 /* Event name */
+        char                    *group;                 /* Event group */
 
         /* Inputs */
-        char    *file;          /* File name */
-        int     line;           /* Line number */
+        char                    *file;                  /* File name */
+        int                     line;                   /* Line number */
 
-        char    *function;      /* Function name */
-        int     offset;         /* Offset bytes */
+        char                    *function;              /* Function name */
+        int                     offset;                 /* Offset bytes */
 
-        int     nr_args;        /* Number of arguments */
-        char    **args;         /* Arguments */
+        int                     nr_args;                /* Number of arguments */
+        char                    **args;                 /* Arguments */
 
-        int     retprobe;       /* Return probe */
+        int                     retprobe;               /* Return probe */
 
         /* Output */
-        int     found;          /* Number of found probe points */
-        char    *probes[MAX_PROBES];    /* Output buffers (will be allocated)*/
+        int                     found;                  /* Number of found probe points */
+        char                    *probes[MAX_PROBES];    /* Output buffers (will be allocated)*/
 };
 
 #ifndef NO_LIBDWARF
 extern int find_probepoint(int fd, struct probe_point *pp);
 
-#include <libdwarf/dwarf.h>
-#include <libdwarf/libdwarf.h>
+/* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */
+#ifndef _MIPS_SZLONG
+# define _MIPS_SZLONG           0
+#endif
+
+#include <dwarf.h>
+#include <libdwarf.h>
 
 struct probe_finder {
-        struct probe_point      *pp;    /* Target probe point */
+        struct probe_point      *pp;                    /* Target probe point */
 
         /* For function searching */
-        Dwarf_Addr      addr;           /* Address */
-        Dwarf_Unsigned  fno;            /* File number */
-        Dwarf_Unsigned  lno;            /* Line number */
-        Dwarf_Off       inl_offs;       /* Inline offset */
-        Dwarf_Die       cu_die;         /* Current CU */
+        Dwarf_Addr              addr;                   /* Address */
+        Dwarf_Unsigned          fno;                    /* File number */
+        Dwarf_Unsigned          lno;                    /* Line number */
+        Dwarf_Off               inl_offs;               /* Inline offset */
+        Dwarf_Die               cu_die;                 /* Current CU */
 
         /* For variable searching */
-        Dwarf_Addr      cu_base;        /* Current CU base address */
-        Dwarf_Locdesc   fbloc;          /* Location of Current Frame Base */
-        const char      *var;           /* Current variable name */
-        char            *buf;           /* Current output buffer */
-        int             len;            /* Length of output buffer */
+        Dwarf_Addr              cu_base;                /* Current CU base address */
+        Dwarf_Locdesc           fbloc;                  /* Location of Current Frame Base */
+        const char              *var;                   /* Current variable name */
+        char                    *buf;                   /* Current output buffer */
+        int                     len;                    /* Length of output buffer */
 };
 #endif /* NO_LIBDWARF */