diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:45:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:45:33 -0800 |
| commit | e770a0f1154193ca6b6e720a86aeaa2edc9261c6 (patch) | |
| tree | 04f5f5420e4116a18be8f94c117aadb870eaa46d /arch/mips/include/asm/cpu-features.h | |
| parent | 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d (diff) | |
| parent | 91dfc423cc8cfd399fb308a837102a7ab7fa067e (diff) | |
| download | op-kernel-dev-e770a0f1154193ca6b6e720a86aeaa2edc9261c6.zip op-kernel-dev-e770a0f1154193ca6b6e720a86aeaa2edc9261c6.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: 64-bit: Detect virtual memory size
MIPS: AR7: Fix USB slave mem range typo
MIPS: Alchemy: Fix dbdma ring destruction memory debugcheck.
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 1f4df64..272c5ef 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h @@ -191,6 +191,9 @@ # ifndef cpu_has_64bit_addresses # define cpu_has_64bit_addresses 0 # endif +# ifndef cpu_vmbits +# define cpu_vmbits 31 +# endif #endif #ifdef CONFIG_64BIT @@ -209,6 +212,10 @@ # ifndef cpu_has_64bit_addresses # define cpu_has_64bit_addresses 1 # endif +# ifndef cpu_vmbits +# define cpu_vmbits cpu_data[0].vmbits +# define __NEED_VMBITS_PROBE +# endif #endif #if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) |
