linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-mips / cpu-info.h

diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h
index a2f0c8e..140be1c 100644 (file)
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
@@ -12,6 +12,7 @@
 #ifndef __ASM_CPU_INFO_H
 #define __ASM_CPU_INFO_H
 
+#include <linux/config.h>
 #include <asm/cache.h>
 
 #ifdef CONFIG_SGI_IP27
@@ -72,16 +73,6 @@ struct cpuinfo_mips {
        struct cache_desc       dcache; /* Primary D or combined I/D cache */
        struct cache_desc       scache; /* Secondary cache */
        struct cache_desc       tcache; /* Tertiary/split secondary cache */
-#if defined(CONFIG_MIPS_MT_SMTC)
-       /*
-        * In the MIPS MT "SMTC" model, each TC is considered
-        * to be a "CPU" for the purposes of scheduling, but
-        * exception resources, ASID spaces, etc, are common
-        * to all TCs within the same VPE.
-        */
-       int                     vpe_id;  /* Virtual Processor number */
-       int                     tc_id;   /* Thread Context number */
-#endif /* CONFIG_MIPS_MT */
        void                    *data;  /* Additional data */
 } __attribute__((aligned(SMP_CACHE_BYTES)));