diff options
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d608c9ebbfe2..b7b2142b58e7 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -258,10 +258,10 @@ static int __cpuinit have_cpuid_p(void) | |||
| 258 | void __init cpu_detect(struct cpuinfo_x86 *c) | 258 | void __init cpu_detect(struct cpuinfo_x86 *c) |
| 259 | { | 259 | { |
| 260 | /* Get vendor name */ | 260 | /* Get vendor name */ |
| 261 | cpuid(0x00000000, &c->cpuid_level, | 261 | cpuid(0x00000000, (unsigned int *)&c->cpuid_level, |
| 262 | (int *)&c->x86_vendor_id[0], | 262 | (unsigned int *)&c->x86_vendor_id[0], |
| 263 | (int *)&c->x86_vendor_id[8], | 263 | (unsigned int *)&c->x86_vendor_id[8], |
| 264 | (int *)&c->x86_vendor_id[4]); | 264 | (unsigned int *)&c->x86_vendor_id[4]); |
| 265 | 265 | ||
| 266 | c->x86 = 4; | 266 | c->x86 = 4; |
| 267 | if (c->cpuid_level >= 0x00000001) { | 267 | if (c->cpuid_level >= 0x00000001) { |
| @@ -283,7 +283,7 @@ void __init cpu_detect(struct cpuinfo_x86 *c) | |||
| 283 | static void __cpuinit early_get_cap(struct cpuinfo_x86 *c) | 283 | static void __cpuinit early_get_cap(struct cpuinfo_x86 *c) |
| 284 | { | 284 | { |
| 285 | u32 tfms, xlvl; | 285 | u32 tfms, xlvl; |
| 286 | int ebx; | 286 | unsigned int ebx; |
| 287 | 287 | ||
| 288 | memset(&c->x86_capability, 0, sizeof c->x86_capability); | 288 | memset(&c->x86_capability, 0, sizeof c->x86_capability); |
| 289 | if (have_cpuid_p()) { | 289 | if (have_cpuid_p()) { |
| @@ -343,14 +343,14 @@ static void __init early_cpu_detect(void) | |||
| 343 | static void __cpuinit generic_identify(struct cpuinfo_x86 * c) | 343 | static void __cpuinit generic_identify(struct cpuinfo_x86 * c) |
| 344 | { | 344 | { |
| 345 | u32 tfms, xlvl; | 345 | u32 tfms, xlvl; |
| 346 | int ebx; | 346 | unsigned int ebx; |
| 347 | 347 | ||
| 348 | if (have_cpuid_p()) { | 348 | if (have_cpuid_p()) { |
| 349 | /* Get vendor name */ | 349 | /* Get vendor name */ |
| 350 | cpuid(0x00000000, &c->cpuid_level, | 350 | cpuid(0x00000000, (unsigned int *)&c->cpuid_level, |
| 351 | (int *)&c->x86_vendor_id[0], | 351 | (unsigned int *)&c->x86_vendor_id[0], |
| 352 | (int *)&c->x86_vendor_id[8], | 352 | (unsigned int *)&c->x86_vendor_id[8], |
| 353 | (int *)&c->x86_vendor_id[4]); | 353 | (unsigned int *)&c->x86_vendor_id[4]); |
| 354 | 354 | ||
| 355 | get_cpu_vendor(c, 0); | 355 | get_cpu_vendor(c, 0); |
| 356 | /* Initialize the standard set of capabilities */ | 356 | /* Initialize the standard set of capabilities */ |
