Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / perf.h

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index f75f3de..2357f4c 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -66,6 +66,7 @@ struct record_opts {
        unsigned int user_freq;
        u64          branch_stack;
        u64          sample_intr_regs;
+       u64          sample_user_regs;
        u64          default_interval;
        u64          user_interval;
        size_t       auxtrace_snapshot_size;