[commits] [git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b

The following commit has been merged in the linux branch: commit de23cf3c42618998a7165364f987267ac9b298f0 Author: David S. Miller davem@davemloft.net Date: Fri Oct 9 00:42:40 2009 -0700

sparc64: Fix niagara2 perf IRQ bits.

Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 04db927..fa5936e 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 = { .lower_shift = 6, .event_mask = 0xfff, .hv_bit = 0x8, - .irq_bit = 0x03, + .irq_bit = 0x30, .upper_nop = 0x220, .lower_nop = 0x220, };