From 357b8ba76ebcdb45735786bcaad8282cd20b5c79 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Mon, 4 Feb 2008 16:48:04 +0100
Subject: [PATCH] --- yaml --- r: 82879 b: refs/heads/master c:
 b6d549a2967881af4f02d02062acbfeb807d44b4 h: refs/heads/master i:   82877:
 6f85bfead637e1a0cd48339bfe035ef49fcc3467   82875:
 fa7fb19441afb51942db3f23eb62dc9793f355d9   82871:
 fc7ff499d0bc03a86e106c8e5167f6f3549bf12d   82863:
 2e371dbedb078a2c4b8b3c5306aee31c2c4318c1   82847:
 17c8f5c68070016d285733bc5e5d0dec7015b5fb   82815:
 ea18d4ab0718b290727e7ba23dc60f5956183fa4 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/cpu/common.c | 10 ----------
 trunk/arch/x86/kernel/cpu/cpu.h    |  9 +++++++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 689e7db975c0..f5bc30e28697 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bb308a1eae2a3b869c498017aed15a699d80799
+refs/heads/master: b6d549a2967881af4f02d02062acbfeb807d44b4
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index b7b2142b58e7..d9313d9adced 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -623,16 +623,6 @@ cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
  * They will insert themselves into the cpu_devs structure.
  * Then, when cpu_init() is called, we can just iterate over that array.
  */
-
-extern int intel_cpu_init(void);
-extern int cyrix_init_cpu(void);
-extern int nsc_init_cpu(void);
-extern int amd_init_cpu(void);
-extern int centaur_init_cpu(void);
-extern int transmeta_init_cpu(void);
-extern int nexgen_init_cpu(void);
-extern int umc_init_cpu(void);
-
 void __init early_cpu_init(void)
 {
 	intel_cpu_init();
diff --git a/trunk/arch/x86/kernel/cpu/cpu.h b/trunk/arch/x86/kernel/cpu/cpu.h
index ad6527a5beb1..e0b38c33d842 100644
--- a/trunk/arch/x86/kernel/cpu/cpu.h
+++ b/trunk/arch/x86/kernel/cpu/cpu.h
@@ -27,3 +27,12 @@ extern void display_cacheinfo(struct cpuinfo_x86 *c);
 extern void early_init_intel(struct cpuinfo_x86 *c);
 extern void early_init_amd(struct cpuinfo_x86 *c);
 
+/* Specific CPU type init functions */
+int intel_cpu_init(void);
+int amd_init_cpu(void);
+int cyrix_init_cpu(void);
+int nsc_init_cpu(void);
+int centaur_init_cpu(void);
+int transmeta_init_cpu(void);
+int nexgen_init_cpu(void);
+int umc_init_cpu(void);