diff options
Diffstat (limited to 'arch/sparc/kernel/perf_event.c')
-rw-r--r-- | arch/sparc/kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 610112ec518a..e2771939341d 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c | |||
@@ -1189,7 +1189,7 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self, | |||
1189 | 1189 | ||
1190 | regs = args->regs; | 1190 | regs = args->regs; |
1191 | 1191 | ||
1192 | data.addr = 0; | 1192 | perf_sample_data_init(&data, 0); |
1193 | 1193 | ||
1194 | cpuc = &__get_cpu_var(cpu_hw_events); | 1194 | cpuc = &__get_cpu_var(cpu_hw_events); |
1195 | 1195 | ||
@@ -1353,7 +1353,7 @@ static void perf_callchain_user_32(struct pt_regs *regs, | |||
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | /* Like powerpc we can't get PMU interrupts within the PMU handler, | 1355 | /* Like powerpc we can't get PMU interrupts within the PMU handler, |
1356 | * so no need for seperate NMI and IRQ chains as on x86. | 1356 | * so no need for separate NMI and IRQ chains as on x86. |
1357 | */ | 1357 | */ |
1358 | static DEFINE_PER_CPU(struct perf_callchain_entry, callchain); | 1358 | static DEFINE_PER_CPU(struct perf_callchain_entry, callchain); |
1359 | 1359 | ||