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

* 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
  perf tools: Avoid unnecessary work in directory lookups
  perf stat: Clean up statistics calculations a bit more
  perf stat: More advanced variance computation
  perf stat: Use stddev_mean in stead of stddev
  perf stat: Remove the limit on repeat
  perf stat: Change noise calculation to use stddev
  x86, perf_counter, bts: Do not allow kernel BTS tracing for now
  x86, perf_counter, bts: Correct pointer-to-u64 casts
  x86, perf_counter, bts: Fail if BTS is not available
  perf_counter: Fix output-sharing error path
  perf trace: Fix read_string()
  perf trace: Print out in nanoseconds
  perf tools: Seek to the end of the header area
  perf trace: Fix parsing of perf.data
  perf trace: Sample timestamps as well
  perf_counter: Introduce new (non-)paranoia level to allow raw tracepoint access
  perf trace: Sample the CPU too
  perf tools: Work around strict aliasing related warnings
  perf tools: Clean up warnings list in the Makefile
  perf tools: Complete support for dynamic strings
  ...

1 files changed, 22 insertions, 0 deletions

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 1bf67190c820..6d8af48c925e 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -53,6 +53,12 @@ static int get_value(struct parse_opt_ctx_t *p,
                 case OPTION_SET_INT:
                 case OPTION_SET_PTR:
                         return opterror(opt, "takes no value", flags);
+                case OPTION_END:
+                case OPTION_ARGUMENT:
+                case OPTION_GROUP:
+                case OPTION_STRING:
+                case OPTION_INTEGER:
+                case OPTION_LONG:
                 default:
                         break;
                 }
@@ -130,6 +136,9 @@ static int get_value(struct parse_opt_ctx_t *p,
                         return opterror(opt, "expects a numerical value", flags);
                 return 0;
 
+        case OPTION_END:
+        case OPTION_ARGUMENT:
+        case OPTION_GROUP:
         default:
                 die("should not happen, someone must be hit on the forehead");
         }
@@ -296,6 +305,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                                 return parse_options_usage(usagestr, options);
                         case -2:
                                 goto unknown;
+                        default:
+                                break;
                         }
                         if (ctx->opt)
                                 check_typos(arg + 1, options);
@@ -314,6 +325,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                                         ctx->argv[0] = strdup(ctx->opt - 1);
                                         *(char *)ctx->argv[0] = '-';
                                         goto unknown;
+                                default:
+                                        break;
                                 }
                         }
                         continue;
@@ -336,6 +349,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                         return parse_options_usage(usagestr, options);
                 case -2:
                         goto unknown;
+                default:
+                        break;
                 }
                 continue;
 unknown:
@@ -456,6 +471,13 @@ int usage_with_options_internal(const char * const *usagestr,
                         }
                         break;
                 default: /* OPTION_{BIT,BOOLEAN,SET_INT,SET_PTR} */
+                case OPTION_END:
+                case OPTION_GROUP:
+                case OPTION_BIT:
+                case OPTION_BOOLEAN:
+                case OPTION_SET_INT:
+                case OPTION_SET_PTR:
+                case OPTION_LONG:
                         break;
                 }