diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 14:05:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 14:05:21 -0500 |
| commit | 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 (patch) | |
| tree | 3288c8411334b47daabc4688df9e5c4e0ba825b6 /arch/x86/oprofile | |
| parent | 37d9a8c5ea8fc063841c133fc53cc168ee620762 (diff) | |
| parent | eb48c9cb2053e7bb5f7f8f0371cb578a0d439450 (diff) | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
apic, amd: Make firmware bug messages more meaningful
mce, amd: Remove goto in threshold_create_device()
mce, amd: Add helper functions to setup APIC
mce, amd: Shorten local variables mci_misc_{hi,lo}
mce, amd: Implement mce_threshold_block_init() helper function
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 | ||