Merge branch 'linux-2.6'

[linux-2.6] / include / asm-mips / mach-qemu / cpu-feature-overrides.h

diff --git a/include/asm-mips/mach-qemu/cpu-feature-overrides.h b/include/asm-mips/mach-qemu/cpu-feature-overrides.h
index f4e370e271684e9fb8884a41c0c592c2e5cb9e4a..d2daaed235d57dbb3f262f70309d470f3cbfd2de 100644 (file)
--- a/include/asm-mips/mach-qemu/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-qemu/cpu-feature-overrides.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2003 Ralf Baechle
+ * Copyright (C) 2003, 07 Ralf Baechle
  */
 #ifndef __ASM_MACH_QEMU_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_QEMU_CPU_FEATURE_OVERRIDES_H
@@ -20,10 +20,11 @@
 
 #define cpu_has_llsc           1
 #define cpu_has_vtag_icache    0
-#define cpu_has_dc_aliases     (PAGE_SIZE < 0x4000)
+#define cpu_has_dc_aliases     0
 #define cpu_has_ic_fills_f_dc  0
 
 #define cpu_has_dsp            0
+#define cpu_has_mipsmt         0
 
 #define cpu_has_nofpuex                0
 #define cpu_has_64bits         0