Home » Mailing list archives » linux-kernel » 2008 » September » 8

[PATCH 9/9] x86: little clean up intel.c/intel_64.c

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Yinghai Lu
Subject: [PATCH 9/9] x86: little clean up intel.c/intel_64.c
Date: Sunday, September 7, 2008 - 5:58 pm

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 arch/x86/kernel/cpu/intel.c    |    7 +++----
 arch/x86/kernel/cpu/intel_64.c |    8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index bafa3a6..a669895 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -76,7 +76,7 @@ static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
 /*
  * find out the number of processor cores on the die
  */
-static int __cpuinit num_cpu_cores(struct cpuinfo_x86 *c)
+static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
 {
 	unsigned int eax, ebx, ecx, edx;
 
@@ -183,7 +183,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology
 		 * detection.
 		 */
-		c->x86_max_cores = num_cpu_cores(c);
+		c->x86_max_cores = intel_num_cpu_cores(c);
 		detect_ht(c);
 	}
 
@@ -210,9 +210,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 
 	if (cpu_has_xmm2)
 		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
-	if (c->x86 == 15) {
+	if (c->x86 == 15)
 		set_cpu_cap(c, X86_FEATURE_P4);
-	}
 	if (c->x86 == 6)
 		set_cpu_cap(c, X86_FEATURE_P3);
 	if (cpu_has_ds) {
diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c
index 14a2cd9..aef4f28 100644
--- a/arch/x86/kernel/cpu/intel_64.c
+++ b/arch/x86/kernel/cpu/intel_64.c
@@ -71,17 +71,15 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 			set_cpu_cap(c, X86_FEATURE_BTS);
 		if (!(l1 & (1<<12)))
 			set_cpu_cap(c, X86_FEATURE_PEBS);
-	}
-
-
-	if (cpu_has_bts)
 		ds_init_intel(c);
+	}
 
 	if (c->x86 == 15)
 		c->x86_cache_alignment = c->x86_clflush_size * 2;
 	if (c->x86 == 6)
 		set_cpu_cap(c, X86_FEATURE_REP_GOOD);
-	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
+	if (cpu_has_xmm2)
+		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
 
 	detect_extended_topology(c);
 	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY))
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/9] x86: cpu make amd.c more like amd_64.c v2, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 2/9] x86: remove duplicated force_mwait, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 3/9] x86: add srat_detect_node for amd64, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 4/9] x86: merge header in amd/64.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 5/9] x86: make amd.c have 64bit support code, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 6/9] x86: make amd_64 have 32 bit code, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 7/9] x86: make 64 bit to use amd.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 8/9] x86: lapic address print out like io apic addr, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 9/9] x86: little clean up intel.c/intel_64.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
Re: [PATCH 7/9] x86: make 64 bit to use amd.c, Ingo Molnar, (Mon Sep 8, 6:33 am)
Re: [PATCH 8/9] x86: lapic address print out like io apic addr, Ingo Molnar, (Mon Sep 8, 6:45 am)
Re: [PATCH 9/9] x86: little clean up intel.c/intel_64.c, Ingo Molnar, (Mon Sep 8, 6:46 am)