diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 19:00:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 19:00:26 -0400 |
| commit | 2f66b529d9d131971e2509aee5478c61ca258ece (patch) | |
| tree | 7a670d9eb76839ed5eecbe0cc1c1c25ba7ba446c /include | |
| parent | 1e66239e23dd0422baf891bf6af0b65ac632b676 (diff) | |
| parent | cdcc9eb5e014a58aba047193a73a0de8b61b988d (diff) | |
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] Fix marge error due to conflict in arch/mips/kernel/head.S
[MIPS] ARC: Remove unused arch/mips/arc/console.c
[MIPS] SNI: sniprom
[MIPS] Jazz: remove unneeded reset functions
[MIPS] Whitespace cleanup.
[MIPS] Make resources for ds1742 "static __initdata"
[MIPS] Replace __attribute_used__ with __used
[MIPS] Jazz: Remove unused arch/mips/jazz/io.c
[MIPS] Mark prom_free_prom_memory as __init_refok
[MIPS] MIPSsim: Fix cflags
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/war.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h index 9de52a5b0f3d..2883ccc69ed0 100644 --- a/include/asm-mips/war.h +++ b/include/asm-mips/war.h | |||
| @@ -188,7 +188,6 @@ | |||
| 188 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 | 188 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 |
| 189 | #endif | 189 | #endif |
| 190 | 190 | ||
| 191 | |||
| 192 | /* | 191 | /* |
| 193 | * On the R10000 upto version 2.6 (not sure about 2.7) there is a bug that | 192 | * On the R10000 upto version 2.6 (not sure about 2.7) there is a bug that |
| 194 | * may cause ll / sc and lld / scd sequences to execute non-atomically. | 193 | * may cause ll / sc and lld / scd sequences to execute non-atomically. |