diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 23:01:59 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 23:01:59 +0400 |
commit | 02d6112cd7d75bf30685ee4b2e9dc0291b4d3133 (patch) | |
tree | b1715624dadae286cac16deb5a634a33f4a46aa6 /include/asm-mips/mach-sibyte/cpu-feature-overrides.h | |
parent | 0b1937ac0ef1541c0ea44e6f81c33d2f59803957 (diff) | |
parent | 941091024ef0f2f7e09eb81201d293ac18833cc8 (diff) | |
download | linux-02d6112cd7d75bf30685ee4b2e9dc0291b4d3133.tar.xz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] User stack pointer randomisation
[MIPS] Remove unused include/asm-mips/gfx.h
[MIPS] Remove unused include/asm-mips/ds1216.h
[MIPS] Workaround for RM7000 WAIT instruction aka erratum 38
[MIPS] Make support for weakly ordered LL/SC a config option.
[MIPS] Disable UserLocal runtime detection on platforms which never have it.
[MIPS] Disable MT runtime detection on platforms which never support MT.
Diffstat (limited to 'include/asm-mips/mach-sibyte/cpu-feature-overrides.h')
-rw-r--r-- | include/asm-mips/mach-sibyte/cpu-feature-overrides.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-mips/mach-sibyte/cpu-feature-overrides.h b/include/asm-mips/mach-sibyte/cpu-feature-overrides.h index a25968f277a2..63d5bf649af1 100644 --- a/include/asm-mips/mach-sibyte/cpu-feature-overrides.h +++ b/include/asm-mips/mach-sibyte/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, 2004 Ralf Baechle + * Copyright (C) 2003, 04, 07 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_MACH_SIBYTE_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_SIBYTE_CPU_FEATURE_OVERRIDES_H @@ -26,6 +26,8 @@ #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_userlocal 0 #define cpu_icache_snoops_remote_store 0 #define cpu_has_nofpuex 0 |