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

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

x86: move transmeta cap read to early_init_transmeta() 



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

arch/x86/kernel/cpu/common.c

+0 −8
Original line number Diff line number Diff line
@@ -465,14 +465,6 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) 
	}



#ifdef CONFIG_X86_64

	/* Transmeta-defined flags: level 0x80860001 */

	xlvl = cpuid_eax(0x80860000);

	if ((xlvl & 0xffff0000) == 0x80860000) {

		/* Don't set x86_cpuid_level here for now to not confuse. */

		if (xlvl >= 0x80860001)

			c->x86_capability[2] = cpuid_edx(0x80860001);

	}



	if (c->extended_cpuid_level >= 0x80000008) {

		u32 eax = cpuid_eax(0x80000008);

arch/x86/kernel/cpu/transmeta.c

+15 −13
Original line number Diff line number Diff line
@@ -5,6 +5,18 @@ 
#include <asm/msr.h>

#include "cpu.h"



static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c)

{

	u32 xlvl;



	/* Transmeta-defined flags: level 0x80860001 */

	xlvl = cpuid_eax(0x80860000);

	if ((xlvl & 0xffff0000) == 0x80860000) {

		if (xlvl >= 0x80860001)

			c->x86_capability[2] = cpuid_edx(0x80860001);

	}

}



static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)

{

	unsigned int cap_mask, uk, max, dummy;
@@ -12,6 +24,8 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) 
	unsigned int cpu_rev, cpu_freq = 0, cpu_flags, new_cpu_rev;

	char cpu_info[65];



	early_init_transmeta(c);



	display_cacheinfo(c);



	/* Print CMS and CPU revision */
@@ -84,23 +98,11 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) 
#endif

}



static void __cpuinit transmeta_identify(struct cpuinfo_x86 *c)

{

	u32 xlvl;



	/* Transmeta-defined flags: level 0x80860001 */

	xlvl = cpuid_eax(0x80860000);

	if ((xlvl & 0xffff0000) == 0x80860000) {

		if (xlvl >= 0x80860001)

			c->x86_capability[2] = cpuid_edx(0x80860001);

	}

}



static struct cpu_dev transmeta_cpu_dev __cpuinitdata = {

	.c_vendor	= "Transmeta",

	.c_ident	= { "GenuineTMx86", "TransmetaCPU" },

	.c_early_init	= early_init_transmeta,

	.c_init		= init_transmeta,

	.c_identify	= transmeta_identify,

	.c_x86_vendor	= X86_VENDOR_TRANSMETA,

};