Messages in this thread Patch in this message | | | Date | Mon, 21 Sep 2009 07:19:09 GMT | From | tip-bot for Paul Mackerras <> | Subject | [tip:perfcounters/urgent] perf_counter/powerpc: Fix compilation after perf_counter_overflow() change |
| |
Commit-ID: a42418acb5c2872fc43e028118c275c2245b5eba Gitweb: http://git.kernel.org/tip/a42418acb5c2872fc43e028118c275c2245b5eba Author: Paul Mackerras <paulus@samba.org> AuthorDate: Mon, 21 Sep 2009 16:44:32 +1000 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 21 Sep 2009 09:03:34 +0200
perf_counter/powerpc: Fix compilation after perf_counter_overflow() change
Commit 5622f295 ("x86, perf_counter, bts: Optimize BTS overflow handling") removed the regs field from struct perf_sample_data and added a regs parameter to perf_counter_overflow(). This breaks the build on powerpc as reported by Sachin Sant:
arch/powerpc/kernel/perf_counter.c: In function 'record_and_restart': arch/powerpc/kernel/perf_counter.c:1165: error: unknown field 'regs' specified in initializer
This adjusts arch/powerpc/kernel/perf_counter.c to correspond with the new struct perf_sample_data and perf_counter_overflow().
Reported-by: Sachin Sant <sachinp@in.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Cc: Markus Metzger <markus.t.metzger@intel.com> Cc: benh@kernel.crashing.org Cc: linuxppc-dev@ozlabs.org Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <19127.8400.376239.586120@drongo.ozlabs.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/powerpc/kernel/perf_counter.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c index 7ceefaf..5ccf9bc 100644 --- a/arch/powerpc/kernel/perf_counter.c +++ b/arch/powerpc/kernel/perf_counter.c @@ -1162,7 +1162,6 @@ static void record_and_restart(struct perf_counter *counter, unsigned long val, */ if (record) { struct perf_sample_data data = { - .regs = regs, .addr = 0, .period = counter->hw.last_period, }; @@ -1170,7 +1169,7 @@ static void record_and_restart(struct perf_counter *counter, unsigned long val, if (counter->attr.sample_type & PERF_SAMPLE_ADDR) perf_get_data_addr(regs, &data.addr); - if (perf_counter_overflow(counter, nmi, &data)) { + if (perf_counter_overflow(counter, nmi, &data, regs)) { /* * Interrupts are coming too fast - throttle them * by setting the counter to 0, so it will be
| |