diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /include/asm-mips/war.h | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-mips/war.h')
| -rw-r--r-- | include/asm-mips/war.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h index ad374bd3f130..70636b41832c 100644 --- a/include/asm-mips/war.h +++ b/include/asm-mips/war.h | |||
| @@ -172,7 +172,8 @@ | |||
| 172 | * On the RM9000 there is a problem which makes the CreateDirtyExclusive | 172 | * On the RM9000 there is a problem which makes the CreateDirtyExclusive |
| 173 | * cache operation unusable on SMP systems. | 173 | * cache operation unusable on SMP systems. |
| 174 | */ | 174 | */ |
| 175 | #if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_PMC_YOSEMITE) | 175 | #if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_PMC_YOSEMITE) || \ |
| 176 | defined(CONFIG_BASLER_EXCITE) | ||
| 176 | #define RM9000_CDEX_SMP_WAR 1 | 177 | #define RM9000_CDEX_SMP_WAR 1 |
| 177 | #endif | 178 | #endif |
| 178 | 179 | ||
| @@ -182,7 +183,7 @@ | |||
| 182 | * being fetched may case spurious exceptions. | 183 | * being fetched may case spurious exceptions. |
| 183 | */ | 184 | */ |
| 184 | #if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_MOMENCO_OCELOT_3) || \ | 185 | #if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_MOMENCO_OCELOT_3) || \ |
| 185 | defined(CONFIG_PMC_YOSEMITE) | 186 | defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_BASLER_EXCITE) |
| 186 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 | 187 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 |
| 187 | #endif | 188 | #endif |
| 188 | 189 | ||