diff options
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index d3574485cb15..29517faaa735 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -141,8 +141,8 @@ static void __init xen_banner(void) | |||
141 | printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); | 141 | printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); |
142 | } | 142 | } |
143 | 143 | ||
144 | static void xen_cpuid(unsigned int *eax, unsigned int *ebx, | 144 | static void xen_cpuid(unsigned int *ax, unsigned int *bx, |
145 | unsigned int *ecx, unsigned int *edx) | 145 | unsigned int *cx, unsigned int *dx) |
146 | { | 146 | { |
147 | unsigned maskedx = ~0; | 147 | unsigned maskedx = ~0; |
148 | 148 | ||
@@ -150,18 +150,18 @@ static void xen_cpuid(unsigned int *eax, unsigned int *ebx, | |||
150 | * Mask out inconvenient features, to try and disable as many | 150 | * Mask out inconvenient features, to try and disable as many |
151 | * unsupported kernel subsystems as possible. | 151 | * unsupported kernel subsystems as possible. |
152 | */ | 152 | */ |
153 | if (*eax == 1) | 153 | if (*ax == 1) |
154 | maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ | 154 | maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ |
155 | (1 << X86_FEATURE_ACPI) | /* disable ACPI */ | 155 | (1 << X86_FEATURE_ACPI) | /* disable ACPI */ |
156 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ | 156 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ |
157 | 157 | ||
158 | asm(XEN_EMULATE_PREFIX "cpuid" | 158 | asm(XEN_EMULATE_PREFIX "cpuid" |
159 | : "=a" (*eax), | 159 | : "=a" (*ax), |
160 | "=b" (*ebx), | 160 | "=b" (*bx), |
161 | "=c" (*ecx), | 161 | "=c" (*cx), |
162 | "=d" (*edx) | 162 | "=d" (*dx) |
163 | : "0" (*eax), "2" (*ecx)); | 163 | : "0" (*ax), "2" (*cx)); |
164 | *edx &= maskedx; | 164 | *dx &= maskedx; |
165 | } | 165 | } |
166 | 166 | ||
167 | static void xen_set_debugreg(int reg, unsigned long val) | 167 | static void xen_set_debugreg(int reg, unsigned long val) |