x86: unify CPU feature string names

Move the CPU feature string names to a separate file (common to 32
and 64 bits); additionally, make <asm/cpufeature.h> includable by host
code in preparation for including the CPU feature strings in the boot
code.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 76 deletions

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 18df70c534b9..c8939dfddfba 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -1068,82 +1068,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         struct cpuinfo_x86 *c = v;
         int cpu = 0, i;
 
-        /*
-         * 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, NULL, "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",
-                "",     /* tsc invariant mapped to constant_tsc */
-                /* nothing */
-        };
-
-
 #ifdef CONFIG_SMP
         cpu = c->cpu_index;
 #endif