Commit 95414930 authored by Magnus Damm's avatar Magnus Damm Committed by Andi Kleen

[PATCH] i386: mark cpu_dev structures as __cpuinitdata

The different cpu_dev structures are all used from __cpuinit callers what
I can tell. So mark them as __cpuinitdata instead of __initdata. I am a
little bit unsure about arch/i386/common.c:default_cpu, especially when it
comes to the purpose of this_cpu.
Signed-off-by: default avatarMagnus Damm <magnus@valinux.co.jp>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent ed77504b
...@@ -259,7 +259,7 @@ static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size) ...@@ -259,7 +259,7 @@ static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
return size; return size;
} }
static struct cpu_dev amd_cpu_dev __initdata = { static struct cpu_dev amd_cpu_dev __cpuinitdata = {
.c_vendor = "AMD", .c_vendor = "AMD",
.c_ident = { "AuthenticAMD" }, .c_ident = { "AuthenticAMD" },
.c_models = { .c_models = {
......
...@@ -457,7 +457,7 @@ static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size ...@@ -457,7 +457,7 @@ static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size
return size; return size;
} }
static struct cpu_dev centaur_cpu_dev __initdata = { static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
.c_vendor = "Centaur", .c_vendor = "Centaur",
.c_ident = { "CentaurHauls" }, .c_ident = { "CentaurHauls" },
.c_init = init_centaur, .c_init = init_centaur,
......
...@@ -49,7 +49,7 @@ static void default_init(struct cpuinfo_x86 * c) ...@@ -49,7 +49,7 @@ static void default_init(struct cpuinfo_x86 * c)
} }
} }
static struct cpu_dev default_cpu = { static struct cpu_dev __cpuinitdata default_cpu = {
.c_init = default_init, .c_init = default_init,
.c_vendor = "Unknown", .c_vendor = "Unknown",
}; };
......
...@@ -429,7 +429,7 @@ static void cyrix_identify(struct cpuinfo_x86 * c) ...@@ -429,7 +429,7 @@ static void cyrix_identify(struct cpuinfo_x86 * c)
} }
} }
static struct cpu_dev cyrix_cpu_dev __initdata = { static struct cpu_dev cyrix_cpu_dev __cpuinitdata = {
.c_vendor = "Cyrix", .c_vendor = "Cyrix",
.c_ident = { "CyrixInstead" }, .c_ident = { "CyrixInstead" },
.c_init = init_cyrix, .c_init = init_cyrix,
...@@ -452,7 +452,7 @@ static int __init cyrix_exit_cpu(void) ...@@ -452,7 +452,7 @@ static int __init cyrix_exit_cpu(void)
late_initcall(cyrix_exit_cpu); late_initcall(cyrix_exit_cpu);
static struct cpu_dev nsc_cpu_dev __initdata = { static struct cpu_dev nsc_cpu_dev __cpuinitdata = {
.c_vendor = "NSC", .c_vendor = "NSC",
.c_ident = { "Geode by NSC" }, .c_ident = { "Geode by NSC" },
.c_init = init_nsc, .c_init = init_nsc,
......
...@@ -40,7 +40,7 @@ static void __init nexgen_identify(struct cpuinfo_x86 * c) ...@@ -40,7 +40,7 @@ static void __init nexgen_identify(struct cpuinfo_x86 * c)
} }
} }
static struct cpu_dev nexgen_cpu_dev __initdata = { static struct cpu_dev nexgen_cpu_dev __cpuinitdata = {
.c_vendor = "Nexgen", .c_vendor = "Nexgen",
.c_ident = { "NexGenDriven" }, .c_ident = { "NexGenDriven" },
.c_models = { .c_models = {
......
...@@ -28,7 +28,7 @@ static void __init init_rise(struct cpuinfo_x86 *c) ...@@ -28,7 +28,7 @@ static void __init init_rise(struct cpuinfo_x86 *c)
set_bit(X86_FEATURE_CX8, c->x86_capability); set_bit(X86_FEATURE_CX8, c->x86_capability);
} }
static struct cpu_dev rise_cpu_dev __initdata = { static struct cpu_dev rise_cpu_dev __cpuinitdata = {
.c_vendor = "Rise", .c_vendor = "Rise",
.c_ident = { "RiseRiseRise" }, .c_ident = { "RiseRiseRise" },
.c_models = { .c_models = {
......
...@@ -97,7 +97,7 @@ static void __init transmeta_identify(struct cpuinfo_x86 * c) ...@@ -97,7 +97,7 @@ static void __init 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_vendor = "Transmeta",
.c_ident = { "GenuineTMx86", "TransmetaCPU" }, .c_ident = { "GenuineTMx86", "TransmetaCPU" },
.c_init = init_transmeta, .c_init = init_transmeta,
......
...@@ -10,7 +10,7 @@ static void __init init_umc(struct cpuinfo_x86 * c) ...@@ -10,7 +10,7 @@ static void __init init_umc(struct cpuinfo_x86 * c)
} }
static struct cpu_dev umc_cpu_dev __initdata = { static struct cpu_dev umc_cpu_dev __cpuinitdata = {
.c_vendor = "UMC", .c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" }, .c_ident = { "UMC UMC UMC" },
.c_models = { .c_models = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment