diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /arch/x86/oprofile | |
| parent | 047a3772feaae8e43d81d790f3d3f80dae8ae676 (diff) | |
| parent | 2d75af2f2a7a6103a6d539a492fe81deacabde44 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 51104b33fd51..c3b8e24f2b16 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
| @@ -610,6 +610,7 @@ static int force_ibs_eilvt_setup(void) | |||
| 610 | ret = setup_ibs_ctl(i); | 610 | ret = setup_ibs_ctl(i); |
| 611 | if (ret) | 611 | if (ret) |
| 612 | return ret; | 612 | return ret; |
| 613 | pr_err(FW_BUG "using offset %d for IBS interrupts\n", i); | ||
| 613 | return 0; | 614 | return 0; |
| 614 | } | 615 | } |
| 615 | 616 | ||