[Xen-changelog] [xen master] x86/AMD: re-use function wide variables in init_amd()

[patchbot@xxxxxxx]

commit 658a736299f7c91b7db1e1c12b01cc8b8f232fa8
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Mar 4 10:59:44 2014 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Mar 4 10:59:44 2014 +0100

    x86/AMD: re-use function wide variables in init_amd()
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
---
 xen/arch/x86/cpu/amd.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 904ad2e..08ec56a 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -399,13 +399,9 @@ static void __devinit init_amd(struct cpuinfo_x86 *c)
                 * revision D (model = 0x14) and later actually support it.
                 * (AMD Erratum #110, docId: 25759).
                 */
-               unsigned int lo, hi;
-
                clear_bit(X86_FEATURE_LAHF_LM, c->x86_capability);
-               if (!rdmsr_amd_safe(0xc001100d, &lo, &hi)) {
-                       hi &= ~1;
-                       wrmsr_amd_safe(0xc001100d, lo, hi);
-               }
+               if (!rdmsr_amd_safe(0xc001100d, &l, &h))
+                       wrmsr_amd_safe(0xc001100d, l, h & ~1);
        }
 
        switch(c->x86)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog