aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-05 03:37:15 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-05 03:40:56 -0400
commit143b604a2d07ff69cc2bc02ecd9395b28e0b5292 (patch)
tree951baf03cc3fa95e7906efe58979769b454b5f3f /arch/x86/kernel/cpu
parent102bbe3ab83c7ac04461d277df23cd5acdb49892 (diff)
x86: cpu/common*.c, merge whitespaces
Merge leftover whitespaces, to make arch/x86/kernel/cpu/common_64.c exactly identical to arch/x86/kernel/cpu/common.c. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/common_64.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
index 6a42371a609f..eef868c97b89 100644
--- a/arch/x86/kernel/cpu/common_64.c
+++ b/arch/x86/kernel/cpu/common_64.c
@@ -26,6 +26,7 @@
26#include <mach_apic.h> 26#include <mach_apic.h>
27#include <asm/genapic.h> 27#include <asm/genapic.h>
28#endif 28#endif
29
29#include <asm/pda.h> 30#include <asm/pda.h>
30#include <asm/pgtable.h> 31#include <asm/pgtable.h>
31#include <asm/processor.h> 32#include <asm/processor.h>
@@ -280,7 +281,6 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c)
280 return 1; 281 return 1;
281} 282}
282 283
283
284void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 284void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
285{ 285{
286 unsigned int n, dummy, ebx, ecx, edx, l2size; 286 unsigned int n, dummy, ebx, ecx, edx, l2size;
@@ -307,7 +307,6 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
307#ifdef CONFIG_X86_64 307#ifdef CONFIG_X86_64
308 c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff); 308 c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff);
309#else 309#else
310
311 /* do processor-specific cache resizing */ 310 /* do processor-specific cache resizing */
312 if (this_cpu->c_size_cache) 311 if (this_cpu->c_size_cache)
313 l2size = this_cpu->c_size_cache(c, l2size); 312 l2size = this_cpu->c_size_cache(c, l2size);
@@ -334,6 +333,7 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
334 333
335 if (!cpu_has(c, X86_FEATURE_HT)) 334 if (!cpu_has(c, X86_FEATURE_HT))
336 return; 335 return;
336
337 if (cpu_has(c, X86_FEATURE_CMP_LEGACY)) 337 if (cpu_has(c, X86_FEATURE_CMP_LEGACY))
338 goto out; 338 goto out;
339 339
@@ -443,7 +443,6 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c)
443 } 443 }
444} 444}
445 445
446
447static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) 446static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
448{ 447{
449 u32 tfms, xlvl; 448 u32 tfms, xlvl;
@@ -452,7 +451,6 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
452 /* Intel-defined flags: level 0x00000001 */ 451 /* Intel-defined flags: level 0x00000001 */
453 if (c->cpuid_level >= 0x00000001) { 452 if (c->cpuid_level >= 0x00000001) {
454 u32 capability, excap; 453 u32 capability, excap;
455
456 cpuid(0x00000001, &tfms, &ebx, &excap, &capability); 454 cpuid(0x00000001, &tfms, &ebx, &excap, &capability);
457 c->x86_capability[0] = capability; 455 c->x86_capability[0] = capability;
458 c->x86_capability[4] = excap; 456 c->x86_capability[4] = excap;
@@ -488,7 +486,6 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
488 } 486 }
489#endif 487#endif
490} 488}
491
492/* 489/*
493 * Do minimum CPU detection early. 490 * Do minimum CPU detection early.
494 * Fields really needed: vendor, cpuid_level, family, model, mask, 491 * Fields really needed: vendor, cpuid_level, family, model, mask,
@@ -500,7 +497,6 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
500 */ 497 */
501static void __init early_identify_cpu(struct cpuinfo_x86 *c) 498static void __init early_identify_cpu(struct cpuinfo_x86 *c)
502{ 499{
503
504#ifdef CONFIG_X86_64 500#ifdef CONFIG_X86_64
505 c->x86_clflush_size = 64; 501 c->x86_clflush_size = 64;
506#else 502#else
@@ -722,12 +718,12 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
722 /* Init Machine Check Exception if available. */ 718 /* Init Machine Check Exception if available. */
723 mcheck_init(c); 719 mcheck_init(c);
724#endif 720#endif
721
725 select_idle_routine(c); 722 select_idle_routine(c);
726 723
727#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64) 724#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)
728 numa_add_cpu(smp_processor_id()); 725 numa_add_cpu(smp_processor_id());
729#endif 726#endif
730
731} 727}
732 728
733void __init identify_boot_cpu(void) 729void __init identify_boot_cpu(void)