From 15f78d3612810c9694eebab15bbbecfe013bafa9 Mon Sep 17 00:00:00 2001
From: Magnus Damm <magnus@valinux.co.jp>
Date: Tue, 26 Sep 2006 10:52:36 +0200
Subject: [PATCH] --- yaml --- r: 35903 b: refs/heads/master c:
 e9dff0ee6694b2edd40b1b448cb786f6a7b02336 h: refs/heads/master i:   35901:
 1ffbfde595a27406d5920c3abece123017820d17   35899:
 c8c785cbc86bf16062382dac7671c1a914640b33   35895:
 d2b73b4721b041e426da98fbc8207e3ced1936d2   35887:
 347878fb7ef58b01174766295927020b72dcef81   35871:
 236a4065630142b8926db6e1815a63b550432326   35839:
 cc4705e82321182264dfd8639d14018807456dff v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/cpu/amd.c     | 2 +-
 trunk/arch/i386/kernel/cpu/centaur.c | 2 +-
 trunk/arch/i386/kernel/cpu/intel.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 67b6d5758fae..42c2b1f13b89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0f1c166647860bb2c2a206338e7d9af3834753
+refs/heads/master: e9dff0ee6694b2edd40b1b448cb786f6a7b02336
diff --git a/trunk/arch/i386/kernel/cpu/amd.c b/trunk/arch/i386/kernel/cpu/amd.c
index 856cd08f2f3d..e4758095d87a 100644
--- a/trunk/arch/i386/kernel/cpu/amd.c
+++ b/trunk/arch/i386/kernel/cpu/amd.c
@@ -246,7 +246,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 		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 --git a/trunk/arch/i386/kernel/cpu/centaur.c b/trunk/arch/i386/kernel/cpu/centaur.c
index 34a81ede7892..8c25047975c0 100644
--- a/trunk/arch/i386/kernel/cpu/centaur.c
+++ b/trunk/arch/i386/kernel/cpu/centaur.c
@@ -442,7 +442,7 @@ static void __cpuinit init_centaur(struct cpuinfo_x86 *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 --git a/trunk/arch/i386/kernel/cpu/intel.c b/trunk/arch/i386/kernel/cpu/intel.c
index 26243e019d11..94a95aa5227e 100644
--- a/trunk/arch/i386/kernel/cpu/intel.c
+++ b/trunk/arch/i386/kernel/cpu/intel.c
@@ -198,7 +198,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 }
 
 
-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