git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' into for-linus
[safe/jmp/linux-2.6]
/
arch
/
sparc
/
kernel
/
perf_event.c
diff --git
a/arch/sparc/kernel/perf_event.c
b/arch/sparc/kernel/perf_event.c
index
9f2b2ba
..
b867ab3
100644
(file)
--- a/
arch/sparc/kernel/perf_event.c
+++ b/
arch/sparc/kernel/perf_event.c
@@
-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);