[Xen-devel] [PATCH 2/4] Import upstream git commit e9dff0ee6694b2edd40b1b448cb786f6a7b02336

[Tim Deegan <Tim.Deegan@xxxxxxxxxx>]

Import upstream git commit e9dff0ee6694b2edd40b1b448cb786f6a7b02336

    [PATCH] i386: mark cpu cache functions as __cpuinit

    Mark i386-specific cpu cache functions as __cpuinit. They are all
    only called from arch/i386/common.c:display_cache_info() that already is
    marked as __cpuinit.

    Signed-off-by: Magnus Damm <magnus@xxxxxxxxxxxxx>
    Signed-off-by: Andi Kleen <ak@xxxxxxx>

diff -r 3be554b47704 -r 0c2193e06af9 arch/i386/kernel/cpu/amd.c
--- a/arch/i386/kernel/cpu/amd.c        Wed Oct 08 13:06:36 2008 +0100
+++ b/arch/i386/kernel/cpu/amd.c        Wed Oct 08 13:30:41 2008 +0100
@@ -246,7 +246,7 @@ static void __init init_amd(struct cpuin
                num_cache_leaves = 3;
 }
 
-static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 * c, unsigned 
int size)
 {
        /* AMD errata T13 (order #21922) */
        if ((c->x86 == 6)) {
diff -r 3be554b47704 -r 0c2193e06af9 arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 13:06:36 2008 +0100
+++ b/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 13:30:41 2008 +0100
@@ -442,7 +442,7 @@ static void __init init_centaur(struct c
        }
 }
 
-static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int 
size)
+static unsigned int __cpuinit centaur_size_cache(struct cpuinfo_x86 * c, 
unsigned int size)
 {
        /* VIA C3 CPUs (670-68F) need further shifting. */
        if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
diff -r 3be554b47704 -r 0c2193e06af9 arch/i386/kernel/cpu/intel.c
--- a/arch/i386/kernel/cpu/intel.c      Wed Oct 08 13:06:36 2008 +0100
+++ b/arch/i386/kernel/cpu/intel.c      Wed Oct 08 13:30:41 2008 +0100
@@ -198,7 +198,7 @@ static void __cpuinit init_intel(struct 
 }
 
 
-static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, 
unsigned int size)
 {
        /* Intel PIII Tualatin. This comes in two flavours.
         * One has 256kb of cache, the other 512. We have no way

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