perf_counter: Introduce struct for sample data

For easy extension of the sample data, put it in a structure.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index 4786ad9a2887..5e0bf399c433 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -1001,7 +1001,11 @@ static void record_and_restart(struct perf_counter *counter, long val,
          * Finally record data if requested.
          */
         if (record) {
-                addr = 0;
+                struct perf_sample_data data = {
+                        .regs = regs,
+                        .addr = 0,
+                };
+
                 if (counter->attr.sample_type & PERF_SAMPLE_ADDR) {
                         /*
                          * The user wants a data address recorded.
@@ -1016,9 +1020,9 @@ static void record_and_restart(struct perf_counter *counter, long val,
                         sdsync = (ppmu->flags & PPMU_ALT_SIPR) ?
                                 POWER6_MMCRA_SDSYNC : MMCRA_SDSYNC;
                         if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync))
-                                addr = mfspr(SPRN_SDAR);
+                                data.addr = mfspr(SPRN_SDAR);
                 }
-                if (perf_counter_overflow(counter, nmi, regs, addr)) {
+                if (perf_counter_overflow(counter, nmi, &data)) {
                         /*
                          * Interrupts are coming too fast - throttle them
                          * by setting the counter to 0, so it will be