Commit-ID: ecd431d95aa04257e977fd6878e4203ce462e7e9 Gitweb: http://git.kernel.org/tip/ecd431d95aa04257e977fd6878e4203ce462e7e9 Author: Borislav Petkov <borislav.petkov@xxxxxxx> AuthorDate: Fri, 1 Jun 2012 16:52:36 +0200 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Thu, 7 Jun 2012 11:41:28 -0700 x86, cpu: Fix show_msr MSR accessing function There's no real reason why, when showing the MSRs on a CPU at boottime, we should be using the AMD-specific variant. Simply use the generic safe one which handles #GPs just fine. Cc: Yinghai Lu <yinghai@xxxxxxxxxx> Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx> Link: http://lkml.kernel.org/r/1338562358-28182-3-git-send-email-bp@xxxxxxxxx Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> --- arch/x86/kernel/cpu/common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 6b9333b..5bbc082 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -947,7 +947,7 @@ static void __cpuinit __print_cpu_msr(void) index_max = msr_range_array[i].max; for (index = index_min; index < index_max; index++) { - if (rdmsrl_amd_safe(index, &val)) + if (rdmsrl_safe(index, &val)) continue; printk(KERN_INFO " MSR%08x: %016llx\n", index, val); } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html