Commit 7fb0f979 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix a lot of broken white space in arch/x86_64/kernel/setup.c

Fix a lot of broken white space in arch/x86_64/kernel/setup.c

Only touches white space, no functional changes.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1d563ebc
...@@ -664,11 +664,11 @@ static void __init display_cacheinfo(struct cpuinfo_x86 *c) ...@@ -664,11 +664,11 @@ static void __init display_cacheinfo(struct cpuinfo_x86 *c)
if (n >= 0x80000006) { if (n >= 0x80000006) {
cpuid(0x80000006, &dummy, &ebx, &ecx, &edx); cpuid(0x80000006, &dummy, &ebx, &ecx, &edx);
ecx = cpuid_ecx(0x80000006); ecx = cpuid_ecx(0x80000006);
c->x86_cache_size = ecx >> 16; c->x86_cache_size = ecx >> 16;
c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff); c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff);
printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n", printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n",
c->x86_cache_size, ecx & 0xFF); c->x86_cache_size, ecx & 0xFF);
} }
...@@ -892,19 +892,19 @@ void __init identify_cpu(struct cpuinfo_x86 *c) ...@@ -892,19 +892,19 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
/* AMD-defined flags: level 0x80000001 */ /* AMD-defined flags: level 0x80000001 */
xlvl = cpuid_eax(0x80000000); xlvl = cpuid_eax(0x80000000);
if ( (xlvl & 0xffff0000) == 0x80000000 ) { if ((xlvl & 0xffff0000) == 0x80000000) {
if ( xlvl >= 0x80000001 ) { if (xlvl >= 0x80000001) {
c->x86_capability[1] = cpuid_edx(0x80000001); c->x86_capability[1] = cpuid_edx(0x80000001);
c->x86_capability[5] = cpuid_ecx(0x80000001); c->x86_capability[5] = cpuid_ecx(0x80000001);
} }
if ( xlvl >= 0x80000004 ) if (xlvl >= 0x80000004)
get_model_name(c); /* Default name */ get_model_name(c); /* Default name */
} }
/* Transmeta-defined flags: level 0x80860001 */ /* Transmeta-defined flags: level 0x80860001 */
xlvl = cpuid_eax(0x80860000); xlvl = cpuid_eax(0x80860000);
if ( (xlvl & 0xffff0000) == 0x80860000 ) { if ((xlvl & 0xffff0000) == 0x80860000) {
if ( xlvl >= 0x80860001 ) if (xlvl >= 0x80860001)
c->x86_capability[2] = cpuid_edx(0x80860001); c->x86_capability[2] = cpuid_edx(0x80860001);
} }
...@@ -918,20 +918,19 @@ void __init identify_cpu(struct cpuinfo_x86 *c) ...@@ -918,20 +918,19 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
* At the end of this section, c->x86_capability better * At the end of this section, c->x86_capability better
* indicate the features this CPU genuinely supports! * indicate the features this CPU genuinely supports!
*/ */
switch ( c->x86_vendor ) { switch (c->x86_vendor) {
case X86_VENDOR_AMD:
case X86_VENDOR_AMD: init_amd(c);
init_amd(c); break;
break;
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
init_intel(c); init_intel(c);
break; break;
case X86_VENDOR_UNKNOWN: case X86_VENDOR_UNKNOWN:
default: default:
display_cacheinfo(c); display_cacheinfo(c);
break; break;
} }
select_idle_routine(c); select_idle_routine(c);
...@@ -944,9 +943,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c) ...@@ -944,9 +943,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
* common between the CPUs. The first time this routine gets * common between the CPUs. The first time this routine gets
* executed, c == &boot_cpu_data. * executed, c == &boot_cpu_data.
*/ */
if ( c != &boot_cpu_data ) { if (c != &boot_cpu_data) {
/* AND the already accumulated flags with these */ /* AND the already accumulated flags with these */
for ( i = 0 ; i < NCAPINTS ; i++ ) for (i = 0 ; i < NCAPINTS ; i++)
boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; boot_cpu_data.x86_capability[i] &= c->x86_capability[i];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment