Commit 95414930548871c6c92a5b0e607b12b81f3d84d8

Authored by Magnus Damm
Committed by Andi Kleen
1 parent ed77504b20

[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: Magnus Damm <magnus@valinux.co.jp>
Signed-off-by: Andi Kleen <ak@suse.de>

Showing 8 changed files with 9 additions and 9 deletions Side-by-side Diff

arch/i386/kernel/cpu/amd.c
... ... @@ -259,7 +259,7 @@
259 259 return size;
260 260 }
261 261  
262   -static struct cpu_dev amd_cpu_dev __initdata = {
  262 +static struct cpu_dev amd_cpu_dev __cpuinitdata = {
263 263 .c_vendor = "AMD",
264 264 .c_ident = { "AuthenticAMD" },
265 265 .c_models = {
arch/i386/kernel/cpu/centaur.c
... ... @@ -457,7 +457,7 @@
457 457 return size;
458 458 }
459 459  
460   -static struct cpu_dev centaur_cpu_dev __initdata = {
  460 +static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
461 461 .c_vendor = "Centaur",
462 462 .c_ident = { "CentaurHauls" },
463 463 .c_init = init_centaur,
arch/i386/kernel/cpu/common.c
... ... @@ -49,7 +49,7 @@
49 49 }
50 50 }
51 51  
52   -static struct cpu_dev default_cpu = {
  52 +static struct cpu_dev __cpuinitdata default_cpu = {
53 53 .c_init = default_init,
54 54 .c_vendor = "Unknown",
55 55 };
arch/i386/kernel/cpu/cyrix.c
... ... @@ -429,7 +429,7 @@
429 429 }
430 430 }
431 431  
432   -static struct cpu_dev cyrix_cpu_dev __initdata = {
  432 +static struct cpu_dev cyrix_cpu_dev __cpuinitdata = {
433 433 .c_vendor = "Cyrix",
434 434 .c_ident = { "CyrixInstead" },
435 435 .c_init = init_cyrix,
... ... @@ -452,7 +452,7 @@
452 452  
453 453 late_initcall(cyrix_exit_cpu);
454 454  
455   -static struct cpu_dev nsc_cpu_dev __initdata = {
  455 +static struct cpu_dev nsc_cpu_dev __cpuinitdata = {
456 456 .c_vendor = "NSC",
457 457 .c_ident = { "Geode by NSC" },
458 458 .c_init = init_nsc,
arch/i386/kernel/cpu/nexgen.c
... ... @@ -40,7 +40,7 @@
40 40 }
41 41 }
42 42  
43   -static struct cpu_dev nexgen_cpu_dev __initdata = {
  43 +static struct cpu_dev nexgen_cpu_dev __cpuinitdata = {
44 44 .c_vendor = "Nexgen",
45 45 .c_ident = { "NexGenDriven" },
46 46 .c_models = {
arch/i386/kernel/cpu/rise.c
... ... @@ -28,7 +28,7 @@
28 28 set_bit(X86_FEATURE_CX8, c->x86_capability);
29 29 }
30 30  
31   -static struct cpu_dev rise_cpu_dev __initdata = {
  31 +static struct cpu_dev rise_cpu_dev __cpuinitdata = {
32 32 .c_vendor = "Rise",
33 33 .c_ident = { "RiseRiseRise" },
34 34 .c_models = {
arch/i386/kernel/cpu/transmeta.c
... ... @@ -97,7 +97,7 @@
97 97 }
98 98 }
99 99  
100   -static struct cpu_dev transmeta_cpu_dev __initdata = {
  100 +static struct cpu_dev transmeta_cpu_dev __cpuinitdata = {
101 101 .c_vendor = "Transmeta",
102 102 .c_ident = { "GenuineTMx86", "TransmetaCPU" },
103 103 .c_init = init_transmeta,
arch/i386/kernel/cpu/umc.c
... ... @@ -10,7 +10,7 @@
10 10  
11 11 }
12 12  
13   -static struct cpu_dev umc_cpu_dev __initdata = {
  13 +static struct cpu_dev umc_cpu_dev __cpuinitdata = {
14 14 .c_vendor = "UMC",
15 15 .c_ident = { "UMC UMC UMC" },
16 16 .c_models = {