diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/mips/include/asm/cpu-features.h | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/mips/include/asm/cpu-features.h')
| -rw-r--r-- | arch/mips/include/asm/cpu-features.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 1f4df647c38..272c5ef35bb 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h | |||
| @@ -191,6 +191,9 @@ | |||
| 191 | # ifndef cpu_has_64bit_addresses | 191 | # ifndef cpu_has_64bit_addresses |
| 192 | # define cpu_has_64bit_addresses 0 | 192 | # define cpu_has_64bit_addresses 0 |
| 193 | # endif | 193 | # endif |
| 194 | # ifndef cpu_vmbits | ||
| 195 | # define cpu_vmbits 31 | ||
| 196 | # endif | ||
| 194 | #endif | 197 | #endif |
| 195 | 198 | ||
| 196 | #ifdef CONFIG_64BIT | 199 | #ifdef CONFIG_64BIT |
| @@ -209,6 +212,10 @@ | |||
| 209 | # ifndef cpu_has_64bit_addresses | 212 | # ifndef cpu_has_64bit_addresses |
| 210 | # define cpu_has_64bit_addresses 1 | 213 | # define cpu_has_64bit_addresses 1 |
| 211 | # endif | 214 | # endif |
| 215 | # ifndef cpu_vmbits | ||
| 216 | # define cpu_vmbits cpu_data[0].vmbits | ||
| 217 | # define __NEED_VMBITS_PROBE | ||
| 218 | # endif | ||
| 212 | #endif | 219 | #endif |
| 213 | 220 | ||
| 214 | #if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) | 221 | #if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) |