ia64/linux-2.6.18-xen.hg

changeset 692:18f976ebc870

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@valinux.co.jp>
Signed-off-by: Andi Kleen <ak@suse.de>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Oct 08 14:12:45 2008 +0100 (2008-10-08)
parents 1ab88d39e2c7
children fe3cd38ff06a
files arch/i386/kernel/cpu/amd.c arch/i386/kernel/cpu/centaur.c arch/i386/kernel/cpu/intel.c
line diff
     1.1 --- a/arch/i386/kernel/cpu/amd.c	Wed Oct 08 14:12:22 2008 +0100
     1.2 +++ b/arch/i386/kernel/cpu/amd.c	Wed Oct 08 14:12:45 2008 +0100
     1.3 @@ -246,7 +246,7 @@ static void __init init_amd(struct cpuin
     1.4  		num_cache_leaves = 3;
     1.5  }
     1.6  
     1.7 -static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     1.8 +static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     1.9  {
    1.10  	/* AMD errata T13 (order #21922) */
    1.11  	if ((c->x86 == 6)) {
     2.1 --- a/arch/i386/kernel/cpu/centaur.c	Wed Oct 08 14:12:22 2008 +0100
     2.2 +++ b/arch/i386/kernel/cpu/centaur.c	Wed Oct 08 14:12:45 2008 +0100
     2.3 @@ -442,7 +442,7 @@ static void __init init_centaur(struct c
     2.4  	}
     2.5  }
     2.6  
     2.7 -static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     2.8 +static unsigned int __cpuinit centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     2.9  {
    2.10  	/* VIA C3 CPUs (670-68F) need further shifting. */
    2.11  	if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
     3.1 --- a/arch/i386/kernel/cpu/intel.c	Wed Oct 08 14:12:22 2008 +0100
     3.2 +++ b/arch/i386/kernel/cpu/intel.c	Wed Oct 08 14:12:45 2008 +0100
     3.3 @@ -198,7 +198,7 @@ static void __cpuinit init_intel(struct 
     3.4  }
     3.5  
     3.6  
     3.7 -static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     3.8 +static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
     3.9  {
    3.10  	/* Intel PIII Tualatin. This comes in two flavours.
    3.11  	 * One has 256kb of cache, the other 512. We have no way