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

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

x86: remove cpu_vendor_dev 



1. add c_x86_vendor into cpu_dev
2. change cpu_devs to static
3. check c_x86_vendor before put that cpu_dev into array
4. remove alignment for 64bit
5. order the sequence in cpu_devs according to link sequence...
   so could put intel at first, then amd...

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

arch/x86/kernel/cpu/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ obj-y += proc.o capflags.o powerflags.o 
obj-$(CONFIG_X86_32)	+= common.o bugs.o cmpxchg.o

obj-$(CONFIG_X86_64)	+= common_64.o bugs_64.o



obj-$(CONFIG_CPU_SUP_INTEL_32)		+= intel.o

obj-$(CONFIG_CPU_SUP_INTEL_64)		+= intel_64.o

obj-$(CONFIG_CPU_SUP_AMD_32)		+= amd.o

obj-$(CONFIG_CPU_SUP_AMD_64)		+= amd_64.o

obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o

obj-$(CONFIG_CPU_SUP_CENTAUR_32)	+= centaur.o

obj-$(CONFIG_CPU_SUP_CENTAUR_64)	+= centaur_64.o

obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o

obj-$(CONFIG_CPU_SUP_INTEL_32)		+= intel.o

obj-$(CONFIG_CPU_SUP_INTEL_64)		+= intel_64.o

obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o



obj-$(CONFIG_X86_MCE)	+= mcheck/

arch/x86/kernel/cpu/amd.c

+2 −1
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static struct cpu_dev amd_cpu_dev __cpuinitdata = { 
	.c_early_init   = early_init_amd,

	.c_init		= init_amd,

	.c_size_cache	= amd_size_cache,

	.c_x86_vendor	= X86_VENDOR_AMD,

};



cpu_vendor_dev_register(X86_VENDOR_AMD, &amd_cpu_dev);
 
cpu_dev_register(amd_cpu_dev);

arch/x86/kernel/cpu/amd_64.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static struct cpu_dev amd_cpu_dev __cpuinitdata = { 
	.c_ident	= { "AuthenticAMD" },

	.c_early_init   = early_init_amd,

	.c_init		= init_amd,

	.c_x86_vendor	= X86_VENDOR_AMD,

};



cpu_vendor_dev_register(X86_VENDOR_AMD, &amd_cpu_dev);

cpu_dev_register(amd_cpu_dev);

arch/x86/kernel/cpu/centaur.c

+2 −1
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = { 
	.c_early_init	= early_init_centaur,

	.c_init		= init_centaur,

	.c_size_cache	= centaur_size_cache,

	.c_x86_vendor	= X86_VENDOR_CENTAUR,

};



cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &centaur_cpu_dev);
 
cpu_dev_register(centaur_cpu_dev);

arch/x86/kernel/cpu/centaur_64.c

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = { 
	.c_ident	= { "CentaurHauls" },

	.c_early_init	= early_init_centaur,

	.c_init		= init_centaur,

	.c_x86_vendor	= X86_VENDOR_CENTAUR,

};



cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &centaur_cpu_dev);

cpu_dev_register(centaur_cpu_dev);