Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (78 commits)
  x86: fix RTC lockdep warning: potential hardirq recursion
  x86: cpa, micro-optimization
  x86: cpa, clean up code flow
  x86: cpa, eliminate CPA_ enum
  x86: cpa, cleanups
  x86: implement gbpages support in change_page_attr()
  x86: support gbpages in pagetable dump
  x86: add gbpages support to lookup_address
  x86: add pgtable accessor functions for gbpages
  x86: add PUD_PAGE_SIZE
  x86: add feature macros for the gbpages cpuid bit
  x86: switch direct mapping setup over to set_pte
  x86: fix page-present check in cpa_flush_range
  x86: remove cpa warning
  x86: remove now unused clear_kernel_mapping
  x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
  x86: cpa selftest, skip non present entries
  x86: CPA fix pagetable split
  x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
  x86: cpa, fix lookup_address
  ...

1 files changed, 0 insertions, 74 deletions

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;