9 files changed, 98 insertions, 207 deletions

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index cfdb2f3bd763..a0c4d7c5dbd7 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-y                   := intel_cacheinfo.o addon_cpuid_features.o
+obj-y                   += feature_names.o
 
 obj-$(CONFIG_X86_32)    += common.o proc.o bugs.o
 obj-$(CONFIG_X86_32)    += amd.o
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index b7b2142b58e7..d9313d9adced 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/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/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
index ad6527a5beb1..e0b38c33d842 100644
--- a/arch/x86/kernel/cpu/cpu.h
+++ b/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);
diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c
new file mode 100644
index 000000000000..ee975ac6bbcb
--- /dev/null
+++ b/arch/x86/kernel/cpu/feature_names.c
@@ -0,0 +1,83 @@
+/*
+ * Strings for the various x86 capability flags.
+ *
+ * This file must not contain any executable code.
+ */
+
+#include "asm/cpufeature.h"
+
+/*
+ * These flag bits must match the definitions in <asm/cpufeature.h>.
+ * NULL means this bit is undefined or reserved; either way it doesn't
+ * have meaning as far as Linux is concerned.  Note that it's important
+ * to realize there is a difference between this table and CPUID -- if
+ * applications want to get the raw CPUID data, they should access
+ * /dev/cpu/<cpu_nr>/cpuid instead.
+ */
+const char * const x86_cap_flags[NCAPINTS*32] = {
+        /* Intel-defined */
+        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
+        "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
+        "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
+        "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
+
+        /* AMD-defined */
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
+        NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",
+        "3dnowext", "3dnow",
+
+        /* Transmeta-defined */
+        "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+        /* Other (Linux-defined) */
+        "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
+        NULL, NULL, NULL, NULL,
+        "constant_tsc", "up", NULL, "arch_perfmon",
+        "pebs", "bts", NULL, NULL,
+        "rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+        /* Intel-defined (#2) */
+        "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
+        "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
+        NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+        /* VIA/Cyrix/Centaur-defined */
+        NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
+        "ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+        /* AMD-defined (#2) */
+        "lahf_lm", "cmp_legacy", "svm", "extapic",
+        "cr8_legacy", "abm", "sse4a", "misalignsse",
+        "3dnowprefetch", "osvw", "ibs", "sse5",
+        "skinit", "wdt", NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+        /* Auxiliary (Linux-defined) */
+        "ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+};
+
+const char *const x86_power_flags[32] = {
+        "ts",   /* temperature sensor */
+        "fid",  /* frequency id control */
+        "vid",  /* voltage id control */
+        "ttp",  /* thermal trip */
+        "tm",
+        "stc",
+        "100mhzsteps",
+        "hwpstate",
+        "",     /* tsc invariant mapped to constant_tsc */
+                /* nothing */
+};
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index d1c372b018db..fae31ce747bd 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -13,6 +13,7 @@
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
 #include <asm/ds.h>
+#include <asm/bugs.h>
 
 #include "cpu.h"
 
diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
index 8e139c70f888..ff14c320040c 100644
--- a/arch/x86/kernel/cpu/mtrr/cyrix.c
+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
@@ -7,8 +7,6 @@
 #include <asm/processor-flags.h>
 #include "mtrr.h"
 
-int arr3_protected;
-
 static void
 cyrix_get_arr(unsigned int reg, unsigned long *base,
               unsigned long *size, mtrr_type * type)
@@ -99,8 +97,6 @@ cyrix_get_free_region(unsigned long base, unsigned long size, int replace_reg)
         case 4:
                 return replace_reg;
         case 3:
-                if (arr3_protected)
-                        break;
         case 2:
         case 1:
         case 0:
@@ -115,8 +111,6 @@ cyrix_get_free_region(unsigned long base, unsigned long size, int replace_reg)
         } else {
                 for (i = 0; i < 7; i++) {
                         cyrix_get_arr(i, &lbase, &lsize, &ltype);
-                        if ((i == 3) && arr3_protected)
-                                continue;
                         if (lsize == 0)
                                 return i;
                 }
@@ -260,107 +254,6 @@ static void cyrix_set_all(void)
         post_set();
 }
 
-#if 0
-/*
- * On Cyrix 6x86(MX) and M II the ARR3 is special: it has connection
- * with the SMM (System Management Mode) mode. So we need the following:
- * Check whether SMI_LOCK (CCR3 bit 0) is set
- *   if it is set, write a warning message: ARR3 cannot be changed!
- *     (it cannot be changed until the next processor reset)
- *   if it is reset, then we can change it, set all the needed bits:
- *   - disable access to SMM memory through ARR3 range (CCR1 bit 7 reset)
- *   - disable access to SMM memory (CCR1 bit 2 reset)
- *   - disable SMM mode (CCR1 bit 1 reset)
- *   - disable write protection of ARR3 (CCR6 bit 1 reset)
- *   - (maybe) disable ARR3
- * Just to be sure, we enable ARR usage by the processor (CCR5 bit 5 set)
- */
-static void __init
-cyrix_arr_init(void)
-{
-        struct set_mtrr_context ctxt;
-        unsigned char ccr[7];
-        int ccrc[7] = { 0, 0, 0, 0, 0, 0, 0 };
-#ifdef CONFIG_SMP
-        int i;
-#endif
-
-        /* flush cache and enable MAPEN */
-        set_mtrr_prepare_save(&ctxt);
-        set_mtrr_cache_disable(&ctxt);
-
-        /* Save all CCRs locally */
-        ccr[0] = getCx86(CX86_CCR0);
-        ccr[1] = getCx86(CX86_CCR1);
-        ccr[2] = getCx86(CX86_CCR2);
-        ccr[3] = ctxt.ccr3;
-        ccr[4] = getCx86(CX86_CCR4);
-        ccr[5] = getCx86(CX86_CCR5);
-        ccr[6] = getCx86(CX86_CCR6);
-
-        if (ccr[3] & 1) {
-                ccrc[3] = 1;
-                arr3_protected = 1;
-        } else {
-                /* Disable SMM mode (bit 1), access to SMM memory (bit 2) and
-                 * access to SMM memory through ARR3 (bit 7).
-                 */
-                if (ccr[1] & 0x80) {
-                        ccr[1] &= 0x7f;
-                        ccrc[1] |= 0x80;
-                }
-                if (ccr[1] & 0x04) {
-                        ccr[1] &= 0xfb;
-                        ccrc[1] |= 0x04;
-                }
-                if (ccr[1] & 0x02) {
-                        ccr[1] &= 0xfd;
-                        ccrc[1] |= 0x02;
-                }
-                arr3_protected = 0;
-                if (ccr[6] & 0x02) {
-                        ccr[6] &= 0xfd;
-                        ccrc[6] = 1;    /* Disable write protection of ARR3 */
-                        setCx86(CX86_CCR6, ccr[6]);
-                }
-                /* Disable ARR3. This is safe now that we disabled SMM. */
-                /* cyrix_set_arr_up (3, 0, 0, 0, FALSE); */
-        }
-        /* If we changed CCR1 in memory, change it in the processor, too. */
-        if (ccrc[1])
-                setCx86(CX86_CCR1, ccr[1]);
-
-        /* Enable ARR usage by the processor */
-        if (!(ccr[5] & 0x20)) {
-                ccr[5] |= 0x20;
-                ccrc[5] = 1;
-                setCx86(CX86_CCR5, ccr[5]);
-        }
-#ifdef CONFIG_SMP
-        for (i = 0; i < 7; i++)
-                ccr_state[i] = ccr[i];
-        for (i = 0; i < 8; i++)
-                cyrix_get_arr(i,
-                              &arr_state[i].base, &arr_state[i].size,
-                              &arr_state[i].type);
-#endif
-
-        set_mtrr_done(&ctxt);   /* flush cache and disable MAPEN */
-
-        if (ccrc[5])
-                printk(KERN_INFO "mtrr: ARR usage was not enabled, enabled manually\n");
-        if (ccrc[3])
-                printk(KERN_INFO "mtrr: ARR3 cannot be changed\n");
-/*
-    if ( ccrc[1] & 0x80) printk ("mtrr: SMM memory access through ARR3 disabled\n");
-    if ( ccrc[1] & 0x04) printk ("mtrr: SMM memory access disabled\n");
-    if ( ccrc[1] & 0x02) printk ("mtrr: SMM mode disabled\n");
-*/
-        if (ccrc[6])
-                printk(KERN_INFO "mtrr: ARR3 was write protected, unprotected\n");
-}
-#endif
-
 static struct mtrr_ops cyrix_mtrr_ops = {
         .vendor            = X86_VENDOR_CYRIX,
 //      .init              = cyrix_arr_init,
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 715919582657..1e27b69a7a0e 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -59,12 +59,6 @@ struct mtrr_ops * mtrr_if = NULL;
 static void set_mtrr(unsigned int reg, unsigned long base,
                      unsigned long size, mtrr_type type);
 
-#ifndef CONFIG_X86_64
-extern int arr3_protected;
-#else
-#define arr3_protected 0
-#endif
-
 void set_mtrr_ops(struct mtrr_ops * ops)
 {
         if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
@@ -513,12 +507,6 @@ int mtrr_del_page(int reg, unsigned long base, unsigned long size)
                 printk(KERN_WARNING "mtrr: register: %d too big\n", reg);
                 goto out;
         }
-        if (is_cpu(CYRIX) && !use_intel()) {
-                if ((reg == 3) && arr3_protected) {
-                        printk(KERN_WARNING "mtrr: ARR3 cannot be changed\n");
-                        goto out;
-                }
-        }
         mtrr_if->get(reg, &lbase, &lsize, &ltype);
         if (lsize < 1) {
                 printk(KERN_WARNING "mtrr: MTRR %d not used\n", reg);
@@ -566,10 +554,6 @@ EXPORT_SYMBOL(mtrr_del);
  * These should be called implicitly, but we can't yet until all the initcall
  * stuff is done...
  */
-extern void amd_init_mtrr(void);
-extern void cyrix_init_mtrr(void);
-extern void centaur_init_mtrr(void);
-
 static void __init init_ifs(void)
 {
 #ifndef CONFIG_X86_64
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
index fb74a2c20814..2cc77eb6fea3 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
@@ -97,3 +97,7 @@ void mtrr_state_warn(void);
 const char *mtrr_attrib_to_str(int x);
 void mtrr_wrmsr(unsigned, unsigned, unsigned);
 
+/* CPU specific mtrr init functions */
+int amd_init_mtrr(void);
+int cyrix_init_mtrr(void);
+int centaur_init_mtrr(void);
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 028213260148..af11d31dce0a 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -10,80 +10,6 @@
  */
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
-        /* 
-         * These flag bits must match the definitions in <asm/cpufeature.h>.
-         * NULL means this bit is undefined or reserved; either way it doesn't
-         * have meaning as far as Linux is concerned.  Note that it's important
-         * to realize there is a difference between this table and CPUID -- if
-         * applications want to get the raw CPUID data, they should access
-         * /dev/cpu/<cpu_nr>/cpuid instead.
-         */
-        static const char * const x86_cap_flags[] = {
-                /* Intel-defined */
-                "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
-                "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
-                "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
-                "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
-
-                /* AMD-defined */
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
-                NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",
-                "3dnowext", "3dnow",
-
-                /* Transmeta-defined */
-                "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-                /* Other (Linux-defined) */
-                "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
-                NULL, NULL, NULL, NULL,
-                "constant_tsc", "up", NULL, "arch_perfmon",
-                "pebs", "bts", NULL, "sync_rdtsc",
-                "rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-                /* Intel-defined (#2) */
-                "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
-                "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
-                NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-                /* VIA/Cyrix/Centaur-defined */
-                NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
-                "ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-                /* AMD-defined (#2) */
-                "lahf_lm", "cmp_legacy", "svm", "extapic",
-                "cr8_legacy", "abm", "sse4a", "misalignsse",
-                "3dnowprefetch", "osvw", "ibs", "sse5",
-                "skinit", "wdt", NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-                /* Auxiliary (Linux-defined) */
-                "ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-        };
-        static const char * const x86_power_flags[] = {
-                "ts",   /* temperature sensor */
-                "fid",  /* frequency id control */
-                "vid",  /* voltage id control */
-                "ttp",  /* thermal trip */
-                "tm",
-                "stc",
-                "100mhzsteps",
-                "hwpstate",
-                "",     /* constant_tsc - moved to flags */
-                /* nothing */
-        };
         struct cpuinfo_x86 *c = v;
         int i, n = 0;
         int fpu_exception;