diff options
author | Paul Mackerras <paulus@samba.org> | 2009-09-21 02:44:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 03:28:40 -0400 |
commit | cd74c86bdf705f824d494a2bbda393d1d562b40a (patch) | |
tree | 8af5261bcd84014f6f587eb326b7dd7c203d0966 /arch/sparc | |
parent | a1792cdacaf5180e04e07811e220c4a3b4a9c33e (diff) |
perf_counter, powerpc, sparc: 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 (and Sparc) 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().
[ v2: also fix Sparc, Markus Metzger <markus.t.metzger@intel.com> ]
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: David S. Miller <davem@davemloft.net>
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>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/perf_counter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/perf_counter.c b/arch/sparc/kernel/perf_counter.c index 09de4035eaa9..b1265ce8a053 100644 --- a/arch/sparc/kernel/perf_counter.c +++ b/arch/sparc/kernel/perf_counter.c | |||
@@ -493,7 +493,6 @@ static int __kprobes perf_counter_nmi_handler(struct notifier_block *self, | |||
493 | 493 | ||
494 | regs = args->regs; | 494 | regs = args->regs; |
495 | 495 | ||
496 | data.regs = regs; | ||
497 | data.addr = 0; | 496 | data.addr = 0; |
498 | 497 | ||
499 | cpuc = &__get_cpu_var(cpu_hw_counters); | 498 | cpuc = &__get_cpu_var(cpu_hw_counters); |
@@ -513,7 +512,7 @@ static int __kprobes perf_counter_nmi_handler(struct notifier_block *self, | |||
513 | if (!sparc_perf_counter_set_period(counter, hwc, idx)) | 512 | if (!sparc_perf_counter_set_period(counter, hwc, idx)) |
514 | continue; | 513 | continue; |
515 | 514 | ||
516 | if (perf_counter_overflow(counter, 1, &data)) | 515 | if (perf_counter_overflow(counter, 1, &data, regs)) |
517 | sparc_pmu_disable_counter(hwc, idx); | 516 | sparc_pmu_disable_counter(hwc, idx); |
518 | } | 517 | } |
519 | 518 | ||