diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
| commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
| tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /arch/x86/kernel/cpu/perf_event_p4.c | |
| parent | ALSA: hda - Set up COEFs for ALC269 to avoid click noises at power-saving (diff) | |
| parent | ALSA: patch_nvhdmi.c: Fix supported sample rate list. (diff) | |
| download | linux-dev-c91925db4925ba0d145478f02c093369196936e9.tar.xz linux-dev-c91925db4925ba0d145478f02c093369196936e9.zip | |
Merge branch 'fix/hda' into topic/hda
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 7e578e9cc58b..b560db3305be 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; } /* |