diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
| commit | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (patch) | |
| tree | 5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc /arch/mips/include/asm/mach-generic | |
| parent | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (diff) | |
| parent | 50c8308538dc9671490d6cb65259ef0ed79f5d13 (diff) | |
| download | linux-5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706.tar.bz2 | |
Merge branch 'next/kvm' into mips-for-linux-next
Diffstat (limited to 'arch/mips/include/asm/mach-generic')
| -rw-r--r-- | arch/mips/include/asm/mach-generic/spaces.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index 73d717a75cb0..5b2f2e68e57f 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -20,14 +20,21 @@ #endif #ifdef CONFIG_32BIT - +#ifdef CONFIG_KVM_GUEST +#define CAC_BASE _AC(0x40000000, UL) +#else #define CAC_BASE _AC(0x80000000, UL) +#endif #define IO_BASE _AC(0xa0000000, UL) #define UNCAC_BASE _AC(0xa0000000, UL) #ifndef MAP_BASE +#ifdef CONFIG_KVM_GUEST +#define MAP_BASE _AC(0x60000000, UL) +#else #define MAP_BASE _AC(0xc0000000, UL) #endif +#endif /* * Memory above this physical address will be considered highmem. |