diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /arch/mips/include/asm/cpu-features.h | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'arch/mips/include/asm/cpu-features.h')
| -rw-r--r-- | arch/mips/include/asm/cpu-features.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 5ea701fc3425..12d12dfe73c0 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h | |||
| @@ -141,6 +141,8 @@ | |||
| 141 | #define cpu_has_mips64 (cpu_has_mips64r1 | cpu_has_mips64r2) | 141 | #define cpu_has_mips64 (cpu_has_mips64r1 | cpu_has_mips64r2) |
| 142 | #define cpu_has_mips_r1 (cpu_has_mips32r1 | cpu_has_mips64r1) | 142 | #define cpu_has_mips_r1 (cpu_has_mips32r1 | cpu_has_mips64r1) |
| 143 | #define cpu_has_mips_r2 (cpu_has_mips32r2 | cpu_has_mips64r2) | 143 | #define cpu_has_mips_r2 (cpu_has_mips32r2 | cpu_has_mips64r2) |
| 144 | #define cpu_has_mips_r (cpu_has_mips32r1 | cpu_has_mips32r2 | \ | ||
| 145 | cpu_has_mips64r1 | cpu_has_mips64r2) | ||
| 144 | 146 | ||
| 145 | #ifndef cpu_has_dsp | 147 | #ifndef cpu_has_dsp |
| 146 | #define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) | 148 | #define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) |