diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-05 17:24:46 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-29 21:10:51 +0100 |
| commit | f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384 (patch) | |
| tree | 1d571a10b4265233b511ce2f45d4ca03b9fbb13a /include/asm-mips | |
| parent | e73ea273ef87a04ff59fc368fa33333dca275dde (diff) | |
| download | linux-3.10-f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384.tar.gz linux-3.10-f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384.tar.bz2 linux-3.10-f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384.zip | |
[MIPS] Fix configuration of R2 CPU features and multithreading.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/cpu-features.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h index 881ce1f9803..44285a9d552 100644 --- a/include/asm-mips/cpu-features.h +++ b/include/asm-mips/cpu-features.h @@ -187,19 +187,15 @@ # endif #endif -#ifdef CONFIG_CPU_MIPSR2 -# if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) -# define cpu_has_vint (cpu_data[0].options & MIPS_CPU_VINT) -# else -# define cpu_has_vint 0 -# endif -# if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic) -# define cpu_has_veic (cpu_data[0].options & MIPS_CPU_VEIC) -# else -# define cpu_has_veic 0 -# endif -#else +#if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) +# define cpu_has_vint (cpu_data[0].options & MIPS_CPU_VINT) +#elif !defined(cpu_has_vint) # define cpu_has_vint 0 +#endif + +#if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic) +# define cpu_has_veic (cpu_data[0].options & MIPS_CPU_VEIC) +#elif !defined(cpu_has_veic) # define cpu_has_veic 0 #endif |