From f1b331559c0f85fb3d0aa2a4b7c1b2185b5052c8 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 29 Sep 2011 13:06:42 -0400 Subject: [PATCH] --- yaml --- r: 264431 b: refs/heads/master c: 5e287830136a8edb76e9f9c432b264d99833172f h: refs/heads/master i: 264429: f90ad5edb888e61e1de9bec5998792794a8c927a 264427: 740ae1a64b9985187ca66da1361818f6421bce82 264423: b42a9ef0a3cd5b15534b8a9ded28d3d252823401 264415: c538b9071262a398a43ddda1ca0a437538cf1c19 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/enlighten.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c9f497c2a86c..26fad3bc856c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d98b15db376b9cc35f74fd2bd432b9fc287a5999 +refs/heads/master: 5e287830136a8edb76e9f9c432b264d99833172f diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index 2d69617950f7..da8afd576a6b 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -251,6 +251,7 @@ static void __init xen_init_cpuid_mask(void) ~((1 << X86_FEATURE_APIC) | /* disable local APIC */ (1 << X86_FEATURE_ACPI)); /* disable ACPI */ ax = 1; + cx = 0; xen_cpuid(&ax, &bx, &cx, &dx); xsave_mask =