From 6f8f53cc645d59f0e5892a54296f5ab82d9fff1f Mon Sep 17 00:00:00 2001 From: "Liu, Jinsong" Date: Fri, 8 Jul 2011 08:30:41 +0100 Subject: [PATCH] x86 cpu: Fix bug: unify cpu_dev attr as __cpuinitdata Currently different x86 cpu define different attr for cpu_dev. Some cpu define as __initdata, this would be risk under cpu hotplug. This patch fix the bug, unify them as __cpuinitdata, as what AMD cpu define now. Signed-off-by: Liu, Jinsong Shan, Haitao --- xen/arch/x86/cpu/centaur.c | 2 +- xen/arch/x86/cpu/cyrix.c | 4 ++-- xen/arch/x86/cpu/intel.c | 2 +- xen/arch/x86/cpu/transmeta.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index c3b2bf6f8c..ffebba9908 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -85,7 +85,7 @@ static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size return size; } -static struct cpu_dev centaur_cpu_dev __initdata = { +static struct cpu_dev centaur_cpu_dev __cpuinitdata = { .c_vendor = "Centaur", .c_ident = { "CentaurHauls" }, .c_init = init_centaur, diff --git a/xen/arch/x86/cpu/cyrix.c b/xen/arch/x86/cpu/cyrix.c index 372ae9a9b7..e33eb70e56 100644 --- a/xen/arch/x86/cpu/cyrix.c +++ b/xen/arch/x86/cpu/cyrix.c @@ -284,7 +284,7 @@ static inline int test_cyrix_52div(void) return (unsigned char) (test >> 8) == 0x02; } -static struct cpu_dev cyrix_cpu_dev __initdata = { +static struct cpu_dev cyrix_cpu_dev __cpuinitdata = { .c_vendor = "Cyrix", .c_ident = { "CyrixInstead" }, .c_init = init_cyrix, @@ -299,7 +299,7 @@ int __init cyrix_init_cpu(void) //early_arch_initcall(cyrix_init_cpu); -static struct cpu_dev nsc_cpu_dev __initdata = { +static struct cpu_dev nsc_cpu_dev __cpuinitdata = { .c_vendor = "NSC", .c_ident = { "Geode by NSC" }, .c_init = init_cyrix, diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index e5878759cb..8cc4371d64 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -276,7 +276,7 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size) return size; } -static struct cpu_dev intel_cpu_dev __devinitdata = { +static struct cpu_dev intel_cpu_dev __cpuinitdata = { .c_vendor = "Intel", .c_ident = { "GenuineIntel" }, .c_models = { diff --git a/xen/arch/x86/cpu/transmeta.c b/xen/arch/x86/cpu/transmeta.c index 76b8105006..4161764cb9 100644 --- a/xen/arch/x86/cpu/transmeta.c +++ b/xen/arch/x86/cpu/transmeta.c @@ -92,7 +92,7 @@ static void transmeta_identify(struct cpuinfo_x86 * c) } } -static struct cpu_dev transmeta_cpu_dev __initdata = { +static struct cpu_dev transmeta_cpu_dev __cpuinitdata = { .c_vendor = "Transmeta", .c_ident = { "GenuineTMx86", "TransmetaCPU" }, .c_init = init_transmeta, -- 2.39.5