diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
| commit | 17d85bc7564571a1cce23ffdb2d2a33301876925 (patch) | |
| tree | 815bfc3a02e94303c7c834770bf2a17012c10bf8 /arch/mips/include/asm/hazards.h | |
| parent | d95c3578120e5bc4784069439f00ccb1b5f87717 (diff) | |
| parent | 041b62374c7fedc11a8a1eeda2868612d3d1436c (diff) | |
Merge commit 'v2.6.29-rc8' into cpus4096
Diffstat (limited to 'arch/mips/include/asm/hazards.h')
| -rw-r--r-- | arch/mips/include/asm/hazards.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h index 43baed16a10..134e1fc8f4d 100644 --- a/arch/mips/include/asm/hazards.h +++ b/arch/mips/include/asm/hazards.h @@ -138,7 +138,8 @@ do { \ __instruction_hazard(); \ } while (0) -#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_CAVIUM_OCTEON) +#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \ + defined(CONFIG_CPU_R5500) /* * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. |