git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
perf_event.c
diff --git
a/arch/sparc/kernel/perf_event.c
b/arch/sparc/kernel/perf_event.c
index
9f2b2ba
..
e277193
100644
(file)
--- 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,
regs = args->regs;
regs = args->regs;
-
data.addr = 0
;
+
perf_sample_data_init(&data, 0)
;
cpuc = &__get_cpu_var(cpu_hw_events);
cpuc = &__get_cpu_var(cpu_hw_events);
@@
-1337,7
+1337,7
@@
static void perf_callchain_user_32(struct pt_regs *regs,
callchain_store(entry, PERF_CONTEXT_USER);
callchain_store(entry, regs->tpc);
callchain_store(entry, PERF_CONTEXT_USER);
callchain_store(entry, regs->tpc);
- ufp = regs->u_regs[UREG_I6];
+ ufp = regs->u_regs[UREG_I6]
& 0xffffffffUL
;
do {
struct sparc_stackf32 *usf, sf;
unsigned long pc;
do {
struct sparc_stackf32 *usf, sf;
unsigned long pc;
@@
-1353,7
+1353,7
@@
static void perf_callchain_user_32(struct pt_regs *regs,
}
/* Like powerpc we can't get PMU interrupts within the PMU handler,
}
/* Like powerpc we can't get PMU interrupts within the PMU handler,
- * so no need for sep
e
rate NMI and IRQ chains as on x86.
+ * so no need for sep
a
rate NMI and IRQ chains as on x86.
*/
static DEFINE_PER_CPU(struct perf_callchain_entry, callchain);
*/
static DEFINE_PER_CPU(struct perf_callchain_entry, callchain);