diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
| commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
| tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /arch/sparc/kernel/perf_event.c | |
| parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8'
Diffstat (limited to 'arch/sparc/kernel/perf_event.c')
| -rw-r--r-- | arch/sparc/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 04db92743896..fa5936e1c3b9 100644 --- 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 = { | |||
| 437 | .lower_shift = 6, | 437 | .lower_shift = 6, |
| 438 | .event_mask = 0xfff, | 438 | .event_mask = 0xfff, |
| 439 | .hv_bit = 0x8, | 439 | .hv_bit = 0x8, |
| 440 | .irq_bit = 0x03, | 440 | .irq_bit = 0x30, |
| 441 | .upper_nop = 0x220, | 441 | .upper_nop = 0x220, |
| 442 | .lower_nop = 0x220, | 442 | .lower_nop = 0x220, |
| 443 | }; | 443 | }; |