Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e4db7c authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: make detect_ht depend on CONFIG_X86_HT 



64-bit has X86_HT set too, so use that instead of SMP.

This also removes a include/asm-x86/processor.h ifdef.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0c8c708a

arch/x86/kernel/cpu/common.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -263,9 +263,9 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 
			l2size, ecx & 0xFF);

			l2size, ecx & 0xFF);

}

}





#ifdef CONFIG_X86_HT

void __cpuinit detect_ht(struct cpuinfo_x86 *c)

void __cpuinit detect_ht(struct cpuinfo_x86 *c)

{

{

#ifdef CONFIG_X86_HT

	u32 eax, ebx, ecx, edx;

	u32 eax, ebx, ecx, edx;

	int index_msb, core_bits;

	int index_msb, core_bits;
@@ -311,8 +311,8 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) 
		printk(KERN_INFO  "CPU: Processor Core ID: %d\n",

		printk(KERN_INFO  "CPU: Processor Core ID: %d\n",

		       c->cpu_core_id);

		       c->cpu_core_id);

	}

	}

}

#endif

#endif

}





static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)

static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)

{

{

arch/x86/kernel/cpu/common_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 




void __cpuinit detect_ht(struct cpuinfo_x86 *c)

void __cpuinit detect_ht(struct cpuinfo_x86 *c)

{

{

#ifdef CONFIG_SMP

#ifdef CONFIG_X86_HT

	u32 eax, ebx, ecx, edx;

	u32 eax, ebx, ecx, edx;

	int index_msb, core_bits;

	int index_msb, core_bits;

include/asm-x86/processor.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -166,11 +166,7 @@ extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); 
extern unsigned short num_cache_leaves;

extern unsigned short num_cache_leaves;





extern void detect_extended_topology(struct cpuinfo_x86 *c);

extern void detect_extended_topology(struct cpuinfo_x86 *c);

#if defined(CONFIG_X86_HT) || defined(CONFIG_X86_64)

extern void detect_ht(struct cpuinfo_x86 *c);

extern void detect_ht(struct cpuinfo_x86 *c);

#else

static inline void detect_ht(struct cpuinfo_x86 *c) {}

#endif





static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

				unsigned int *ecx, unsigned int *edx)

				unsigned int *ecx, unsigned int *edx)