diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:56:40 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:56:40 -0400 |
| commit | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (patch) | |
| tree | 5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc /arch/mips/include/asm/mach-generic/spaces.h | |
| parent | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (diff) | |
| parent | 50c8308538dc9671490d6cb65259ef0ed79f5d13 (diff) | |
Merge branch 'next/kvm' into mips-for-linux-next
Diffstat (limited to 'arch/mips/include/asm/mach-generic/spaces.h')
| -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 @@ | |||
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_32BIT | 22 | #ifdef CONFIG_32BIT |
| 23 | 23 | #ifdef CONFIG_KVM_GUEST | |
| 24 | #define CAC_BASE _AC(0x40000000, UL) | ||
| 25 | #else | ||
| 24 | #define CAC_BASE _AC(0x80000000, UL) | 26 | #define CAC_BASE _AC(0x80000000, UL) |
| 27 | #endif | ||
| 25 | #define IO_BASE _AC(0xa0000000, UL) | 28 | #define IO_BASE _AC(0xa0000000, UL) |
| 26 | #define UNCAC_BASE _AC(0xa0000000, UL) | 29 | #define UNCAC_BASE _AC(0xa0000000, UL) |
| 27 | 30 | ||
| 28 | #ifndef MAP_BASE | 31 | #ifndef MAP_BASE |
| 32 | #ifdef CONFIG_KVM_GUEST | ||
| 33 | #define MAP_BASE _AC(0x60000000, UL) | ||
| 34 | #else | ||
| 29 | #define MAP_BASE _AC(0xc0000000, UL) | 35 | #define MAP_BASE _AC(0xc0000000, UL) |
| 30 | #endif | 36 | #endif |
| 37 | #endif | ||
| 31 | 38 | ||
| 32 | /* | 39 | /* |
| 33 | * Memory above this physical address will be considered highmem. | 40 | * Memory above this physical address will be considered highmem. |