diff options
| author | James Hogan <james.hogan@imgtec.com> | 2015-04-27 15:07:16 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-05 10:12:46 -0400 |
| commit | 19194bcaea1812960b0d3927f728b30f4a850581 (patch) | |
| tree | f6ce19569d368aca7f512b0cdc7e3cbbf4268fdd /arch | |
| parent | a609b382970b68165c4e2d01f456bc7ed79ca96c (diff) | |
| download | linux-stable-19194bcaea1812960b0d3927f728b30f4a850581.tar.gz linux-stable-19194bcaea1812960b0d3927f728b30f4a850581.tar.bz2 linux-stable-19194bcaea1812960b0d3927f728b30f4a850581.zip | |
MIPS: Fix KVM guest fixmap address
[ Upstream commit 8e748c8d09a9314eedb5c6367d9acfaacddcdc88 ]
KVM guest kernels for trap & emulate run in user mode, with a modified
set of kernel memory segments. However the fixmap address is still in
the normal KSeg3 region at 0xfffe0000 regardless, causing problems when
cache alias handling makes use of them when handling copy on write.
Therefore define FIXADDR_TOP as 0x7ffe0000 in the guest kernel mapped
region when CONFIG_KVM_GUEST is defined.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # v3.10+
Patchwork: https://patchwork.linux-mips.org/patch/9887/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/include/asm/mach-generic/spaces.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index 9488fa5f8866..afc96ecb9004 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -94,7 +94,11 @@ #endif #ifndef FIXADDR_TOP +#ifdef CONFIG_KVM_GUEST +#define FIXADDR_TOP ((unsigned long)(long)(int)0x7ffe0000) +#else #define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000) #endif +#endif #endif /* __ASM_MACH_GENERIC_SPACES_H */ |