[Xen-changelog] [linux-2.6.18-xen] Import upstream git commit 95414930548871c6c92a5b0e607b12b81f3d84d8

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1223471542 -3600
# Node ID 1ab88d39e2c7ce64984773643c0fb4868b121ee7
# Parent  c3a007862994f3225e35c1608b3ebfc63d08a66d
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@xxxxxxxxxxxxx>
    Signed-off-by: Andi Kleen <ak@xxxxxxx>
---
 arch/i386/kernel/cpu/amd.c       |    2 +-
 arch/i386/kernel/cpu/centaur.c   |    2 +-
 arch/i386/kernel/cpu/common.c    |    2 +-
 arch/i386/kernel/cpu/cyrix.c     |    4 ++--
 arch/i386/kernel/cpu/nexgen.c    |    2 +-
 arch/i386/kernel/cpu/rise.c      |    2 +-
 arch/i386/kernel/cpu/transmeta.c |    2 +-
 arch/i386/kernel/cpu/umc.c       |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/amd.c
--- a/arch/i386/kernel/cpu/amd.c        Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/amd.c        Wed Oct 08 14:12:22 2008 +0100
@@ -259,7 +259,7 @@ static unsigned int amd_size_cache(struc
        return size;
 }
 
-static struct cpu_dev amd_cpu_dev __initdata = {
+static struct cpu_dev amd_cpu_dev __cpuinitdata = {
        .c_vendor       = "AMD",
        .c_ident        = { "AuthenticAMD" },
        .c_models = {
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 14:12:22 2008 +0100
@@ -457,7 +457,7 @@ static unsigned int centaur_size_cache(s
        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 -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/common.c     Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/common.c     Wed Oct 08 14:12:22 2008 +0100
@@ -49,7 +49,7 @@ static void default_init(struct cpuinfo_
        }
 }
 
-static struct cpu_dev default_cpu = {
+static struct cpu_dev __cpuinitdata default_cpu = {
        .c_init = default_init,
        .c_vendor = "Unknown",
 };
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/cyrix.c
--- a/arch/i386/kernel/cpu/cyrix.c      Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/cyrix.c      Wed Oct 08 14:12:22 2008 +0100
@@ -430,7 +430,7 @@ static void cyrix_identify(struct cpuinf
        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,
@@ -453,7 +453,7 @@ static int __init cyrix_exit_cpu(void)
 
 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_ident        = { "Geode by NSC" },
        .c_init         = init_nsc,
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/nexgen.c
--- a/arch/i386/kernel/cpu/nexgen.c     Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/nexgen.c     Wed Oct 08 14:12:22 2008 +0100
@@ -41,7 +41,7 @@ static void __init nexgen_identify(struc
        generic_identify(c);
 }
 
-static struct cpu_dev nexgen_cpu_dev __initdata = {
+static struct cpu_dev nexgen_cpu_dev __cpuinitdata = {
        .c_vendor       = "Nexgen",
        .c_ident        = { "NexGenDriven" },
        .c_models = {
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/rise.c
--- a/arch/i386/kernel/cpu/rise.c       Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/rise.c       Wed Oct 08 14:12:22 2008 +0100
@@ -28,7 +28,7 @@ static void __init init_rise(struct cpui
        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_ident        = { "RiseRiseRise" },
        .c_models = {
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/transmeta.c
--- a/arch/i386/kernel/cpu/transmeta.c  Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/transmeta.c  Wed Oct 08 14:12:22 2008 +0100
@@ -98,7 +98,7 @@ static void __init transmeta_identify(st
        }
 }
 
-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,
diff -r c3a007862994 -r 1ab88d39e2c7 arch/i386/kernel/cpu/umc.c
--- a/arch/i386/kernel/cpu/umc.c        Wed Oct 08 10:20:25 2008 +0100
+++ b/arch/i386/kernel/cpu/umc.c        Wed Oct 08 14:12:22 2008 +0100
@@ -10,7 +10,7 @@ static void __init init_umc(struct cpuin
 
 }
 
-static struct cpu_dev umc_cpu_dev __initdata = {
+static struct cpu_dev umc_cpu_dev __cpuinitdata = {
        .c_vendor       = "UMC",
        .c_ident        = { "UMC UMC UMC" },
        .c_models = {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog