From 8c8bd042a5986be2605faef4928670314f99800f Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 25 Apr 2012 12:55:22 +0200 Subject: [PATCH] --- yaml --- r: 304881 b: refs/heads/master c: fab06992de6433af097c4a1d2d1b119812753ca7 h: refs/heads/master i: 304879: b6fb557e0db44803160721389e68db21e5ae433c v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d3d0fbf930b4..a967af5996b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db98c5faf8cb350212ea3af786cb3ba0d4e7a01e +refs/heads/master: fab06992de6433af097c4a1d2d1b119812753ca7 diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 573d24873459..8ff74d439041 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c @@ -469,7 +469,7 @@ static __init int perf_event_ibs_init(void) perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch"); perf_ibs_pmu_init(&perf_ibs_op, "ibs_op"); - register_nmi_handler(NMI_LOCAL, &perf_ibs_nmi_handler, 0, "perf_ibs"); + register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ibs"); printk(KERN_INFO "perf: AMD IBS detected (0x%08x)\n", ibs_caps); return 0;