aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu, Jinsong <jinsong.liu@intel.com>2011-07-08 09:01:08 +0100
committerLiu, Jinsong <jinsong.liu@intel.com>2011-07-08 09:01:08 +0100
commit30733ac2942b2ab52a3363aff051c64dd47b1348 (patch)
tree7728cc5b03389334db12d4f93e0edc23134f2cf1
parent22aa69c4aab6a419e275a48748b759c7eeb4cbb0 (diff)
downloadxen-30733ac2942b2ab52a3363aff051c64dd47b1348.tar.gz
xen-30733ac2942b2ab52a3363aff051c64dd47b1348.tar.bz2
xen-30733ac2942b2ab52a3363aff051c64dd47b1348.zip
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 <jinsong.liu@intel.com> Shan, Haitao <haitao.shan@intel.com> xen-unstable changeset: 23659:7fe0331986c5 xen-unstable date: Fri Jul 08 08:30:41 2011 +0100
-rw-r--r--xen/arch/x86/cpu/centaur.c2
-rw-r--r--xen/arch/x86/cpu/cyrix.c4
-rw-r--r--xen/arch/x86/cpu/intel.c2
-rw-r--r--xen/arch/x86/cpu/transmeta.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c
index a46e632bed..9236c37770 100644
--- a/xen/arch/x86/cpu/centaur.c
+++ b/xen/arch/x86/cpu/centaur.c
@@ -86,7 +86,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 66e7e75143..bc78871eea 100644
--- a/xen/arch/x86/cpu/cyrix.c
+++ b/xen/arch/x86/cpu/cyrix.c
@@ -368,7 +368,7 @@ static void cyrix_identify(struct cpuinfo_x86 * c)
generic_identify(c);
}
-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,
@@ -383,7 +383,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 ac0467b6e3..1f3fcf7393 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -240,7 +240,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,