diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-13 01:02:18 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-13 01:02:18 +0100 |
| commit | 9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch) | |
| tree | 569b5a13b3f7030a603460d8d9ded035a6f7f48f /arch/x86/kernel/cpu/perf_event_p4.c | |
| parent | 897493504addc5609f04a2c4f73c37ab972c29b2 (diff) | |
| parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
| download | kernel_samsung_smdk4412-9277bf4b4f94655eef177d0daffa90a47c51eb62.tar.gz kernel_samsung_smdk4412-9277bf4b4f94655eef177d0daffa90a47c51eb62.tar.bz2 kernel_samsung_smdk4412-9277bf4b4f94655eef177d0daffa90a47c51eb62.zip | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_p4.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_p4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index 7e578e9cc58..b560db3305b 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c @@ -692,7 +692,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs) inc_irq_stat(apic_perf_irqs); } - return handled > 0; + return handled; } /* |