From b05449983808c33d1abe9cfd00005c05683c5471 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Fri, 1 Jun 2012 16:52:36 +0200
Subject: [PATCH] --- yaml --- r: 312295 b: refs/heads/master c:
 ecd431d95aa04257e977fd6878e4203ce462e7e9 h: refs/heads/master i:   312293:
 76f014fb8a1e8785df7e3bb081c22e65f7b3d33b   312291:
 9810f3b2a9dd0d8329bc82ea40a9c5d3590aeac7   312287:
 65c74399538d12d57e2e070099630c1831749ef0 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/cpu/common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1e44f8ce0ed..b0f1f1623e97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f975f78c84c852e09463a2dfa57e3174e5c719e
+refs/heads/master: ecd431d95aa04257e977fd6878e4203ce462e7e9
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index 6b9333b429ba..5bbc082c47ad 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/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);
 		}