ia64/linux-2.6.18-xen.hg

changeset 691:1ab88d39e2c7

Import upstream git commit 95414930548871c6c92a5b0e607b12b81f3d84d8

[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>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Oct 08 14:12:22 2008 +0100 (2008-10-08)
parents c3a007862994
children 18f976ebc870
files arch/i386/kernel/cpu/amd.c arch/i386/kernel/cpu/centaur.c arch/i386/kernel/cpu/common.c arch/i386/kernel/cpu/cyrix.c arch/i386/kernel/cpu/nexgen.c arch/i386/kernel/cpu/rise.c arch/i386/kernel/cpu/transmeta.c arch/i386/kernel/cpu/umc.c
line diff
     1.1 --- a/arch/i386/kernel/cpu/amd.c	Wed Oct 08 10:20:25 2008 +0100
     1.2 +++ b/arch/i386/kernel/cpu/amd.c	Wed Oct 08 14:12:22 2008 +0100
     1.3 @@ -259,7 +259,7 @@ static unsigned int amd_size_cache(struc
     1.4  	return size;
     1.5  }
     1.6  
     1.7 -static struct cpu_dev amd_cpu_dev __initdata = {
     1.8 +static struct cpu_dev amd_cpu_dev __cpuinitdata = {
     1.9  	.c_vendor	= "AMD",
    1.10  	.c_ident 	= { "AuthenticAMD" },
    1.11  	.c_models = {
     2.1 --- a/arch/i386/kernel/cpu/centaur.c	Wed Oct 08 10:20:25 2008 +0100
     2.2 +++ b/arch/i386/kernel/cpu/centaur.c	Wed Oct 08 14:12:22 2008 +0100
     2.3 @@ -457,7 +457,7 @@ static unsigned int centaur_size_cache(s
     2.4  	return size;
     2.5  }
     2.6  
     2.7 -static struct cpu_dev centaur_cpu_dev __initdata = {
     2.8 +static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
     2.9  	.c_vendor	= "Centaur",
    2.10  	.c_ident	= { "CentaurHauls" },
    2.11  	.c_init		= init_centaur,
     3.1 --- a/arch/i386/kernel/cpu/common.c	Wed Oct 08 10:20:25 2008 +0100
     3.2 +++ b/arch/i386/kernel/cpu/common.c	Wed Oct 08 14:12:22 2008 +0100
     3.3 @@ -49,7 +49,7 @@ static void default_init(struct cpuinfo_
     3.4  	}
     3.5  }
     3.6  
     3.7 -static struct cpu_dev default_cpu = {
     3.8 +static struct cpu_dev __cpuinitdata default_cpu = {
     3.9  	.c_init	= default_init,
    3.10  	.c_vendor = "Unknown",
    3.11  };
     4.1 --- a/arch/i386/kernel/cpu/cyrix.c	Wed Oct 08 10:20:25 2008 +0100
     4.2 +++ b/arch/i386/kernel/cpu/cyrix.c	Wed Oct 08 14:12:22 2008 +0100
     4.3 @@ -430,7 +430,7 @@ static void cyrix_identify(struct cpuinf
     4.4  	generic_identify(c);
     4.5  }
     4.6  
     4.7 -static struct cpu_dev cyrix_cpu_dev __initdata = {
     4.8 +static struct cpu_dev cyrix_cpu_dev __cpuinitdata = {
     4.9  	.c_vendor	= "Cyrix",
    4.10  	.c_ident 	= { "CyrixInstead" },
    4.11  	.c_init		= init_cyrix,
    4.12 @@ -453,7 +453,7 @@ static int __init cyrix_exit_cpu(void)
    4.13  
    4.14  late_initcall(cyrix_exit_cpu);
    4.15  
    4.16 -static struct cpu_dev nsc_cpu_dev __initdata = {
    4.17 +static struct cpu_dev nsc_cpu_dev __cpuinitdata = {
    4.18  	.c_vendor	= "NSC",
    4.19  	.c_ident 	= { "Geode by NSC" },
    4.20  	.c_init		= init_nsc,
     5.1 --- a/arch/i386/kernel/cpu/nexgen.c	Wed Oct 08 10:20:25 2008 +0100
     5.2 +++ b/arch/i386/kernel/cpu/nexgen.c	Wed Oct 08 14:12:22 2008 +0100
     5.3 @@ -41,7 +41,7 @@ static void __init nexgen_identify(struc
     5.4  	generic_identify(c);
     5.5  }
     5.6  
     5.7 -static struct cpu_dev nexgen_cpu_dev __initdata = {
     5.8 +static struct cpu_dev nexgen_cpu_dev __cpuinitdata = {
     5.9  	.c_vendor	= "Nexgen",
    5.10  	.c_ident	= { "NexGenDriven" },
    5.11  	.c_models = {
     6.1 --- a/arch/i386/kernel/cpu/rise.c	Wed Oct 08 10:20:25 2008 +0100
     6.2 +++ b/arch/i386/kernel/cpu/rise.c	Wed Oct 08 14:12:22 2008 +0100
     6.3 @@ -28,7 +28,7 @@ static void __init init_rise(struct cpui
     6.4  	set_bit(X86_FEATURE_CX8, c->x86_capability);
     6.5  }
     6.6  
     6.7 -static struct cpu_dev rise_cpu_dev __initdata = {
     6.8 +static struct cpu_dev rise_cpu_dev __cpuinitdata = {
     6.9  	.c_vendor	= "Rise",
    6.10  	.c_ident	= { "RiseRiseRise" },
    6.11  	.c_models = {
     7.1 --- a/arch/i386/kernel/cpu/transmeta.c	Wed Oct 08 10:20:25 2008 +0100
     7.2 +++ b/arch/i386/kernel/cpu/transmeta.c	Wed Oct 08 14:12:22 2008 +0100
     7.3 @@ -98,7 +98,7 @@ static void __init transmeta_identify(st
     7.4  	}
     7.5  }
     7.6  
     7.7 -static struct cpu_dev transmeta_cpu_dev __initdata = {
     7.8 +static struct cpu_dev transmeta_cpu_dev __cpuinitdata = {
     7.9  	.c_vendor	= "Transmeta",
    7.10  	.c_ident	= { "GenuineTMx86", "TransmetaCPU" },
    7.11  	.c_init		= init_transmeta,
     8.1 --- a/arch/i386/kernel/cpu/umc.c	Wed Oct 08 10:20:25 2008 +0100
     8.2 +++ b/arch/i386/kernel/cpu/umc.c	Wed Oct 08 14:12:22 2008 +0100
     8.3 @@ -10,7 +10,7 @@ static void __init init_umc(struct cpuin
     8.4  
     8.5  }
     8.6  
     8.7 -static struct cpu_dev umc_cpu_dev __initdata = {
     8.8 +static struct cpu_dev umc_cpu_dev __cpuinitdata = {
     8.9  	.c_vendor	= "UMC",
    8.10  	.c_ident 	= { "UMC UMC UMC" },
    8.11  	.c_models = {