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 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
04db927
..
fa5936e
100644
(file)
--- a/
arch/sparc/kernel/perf_event.c
+++ b/
arch/sparc/kernel/perf_event.c
@@
-437,7
+437,7
@@
static const struct sparc_pmu niagara2_pmu = {
.lower_shift = 6,
.event_mask = 0xfff,
.hv_bit = 0x8,
- .irq_bit = 0x
03
,
+ .irq_bit = 0x
30
,
.upper_nop = 0x220,
.lower_nop = 0x220,
};