diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2012-06-01 14:52:36 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-07 18:41:28 (GMT) |
| commit | ecd431d95aa04257e977fd6878e4203ce462e7e9 (patch) | |
| tree | 80bf7bf5ee260754a5291800ef1230a6d1666da0 /arch/x86/kernel/cpu/common.c | |
| parent | 1f975f78c84c852e09463a2dfa57e3174e5c719e (diff) | |
| download | linux-fsl-qoriq-ecd431d95aa04257e977fd6878e4203ce462e7e9.tar.xz | |
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@kernel.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1338562358-28182-3-git-send-email-bp@amd64.org
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | 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); } |